summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorWolfgang Bremer <wbremer@blackberry.com>2014-04-11 13:30:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-14 12:21:50 +0200
commit865c181fbd4f34d6ecfbe5d2ced4dc36c02fc5fb (patch)
tree51a96aa59b8fb7682609ba73ce4f6991075bbb66 /configure
parentf946a1d0c16aec03364ef02f9f1708830bab0d79 (diff)
Make objcopy config test cross platform functional
This removes the old objcopy.test script and adds a cross platform qmake project for auto detection. Change-Id: Icc7c40d72fb0ff751d214b7351e20652f7b15945 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 10 insertions, 8 deletions
diff --git a/configure b/configure
index 89c2318d82..67a5a4b537 100755
--- a/configure
+++ b/configure
@@ -3178,7 +3178,7 @@ if [ "$CFG_PRECOMPILE" = "auto" ]; then
fi
fi
-# auto-detect support for separate debug info in objcopy
+# sanity-check for separate debug info
if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
if [ "$CFG_SHARED" = "no" ]; then
echo "ERROR: -separate-debug-info is incompatible with -static"
@@ -3188,13 +3188,6 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
echo "ERROR: -separate-debug-info needs -debug, -debug-and-release, or -force-debug-info"
exit 1
fi
- TEST_OBJCOPY=`getXQMakeConf QMAKE_OBJCOPY`
- COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS"
- if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$TEST_OBJCOPY" "$OPT_VERBOSE"; then
- echo "ERROR: -separate-debug-info was requested but this binutils does not support it."
- echo "Re-run configure with -v for more information"
- exit 1
- fi
fi
# auto-detect -fvisibility support
@@ -3936,6 +3929,15 @@ fi
# functionality tests
#-------------------------------------------------------------------------------
+# Detect objcopy support
+if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
+ if ! compileTest unix/objcopy "objcopy"; then
+ echo "ERROR: -separate-debug-info was requested but this binutils does not support it."
+ echo "Re-run configure with -v for more information"
+ exit 1
+ fi
+fi
+
# Detect C++11 support
if [ "$CFG_CXX11" != "no" ]; then
# Configure detects compiler features based on cross compiler, so we need