diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-03 20:01:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-20 10:36:34 +0100 |
| commit | 085a9f0822771d56893ad240e74a0cb37f18b42f (patch) | |
| tree | b633f0bbd3c9177f9fd5a8f928dbc6b3085631bc | |
| parent | 64ffc075209fe88030621c08f297dfbdb2f52c6a (diff) | |
make -separate-debug-info configure tests sane
as the option needs to be explicitly requested, just error out when
objcopy is bad.
also, disabling it after performing the test successfully isn't a very
clever thing to do. hpux is dead anyway, so just remove that logic.
Change-Id: I923a3912fc29da646c492c27aa29091ffeb2e42d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rwxr-xr-x | configure | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -3449,17 +3449,9 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then 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 - CFG_SEPARATE_DEBUG_INFO=no - else - case "$PLATFORM" in - hpux-*) - # binutils on HP-UX is buggy; default to no. - CFG_SEPARATE_DEBUG_INFO=no - ;; - *) - CFG_SEPARATE_DEBUG_INFO=yes - ;; - esac + 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 |