From d8323376670fdc65e4a4a654def8b78b650bdbe7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 13 Mar 2019 10:34:46 +0100 Subject: Fix detection of QMAKE_DEFAULT{INC|LIB}DIRS for gcc cross-builds The --sysroot flag is added to QMAKE_CXXFLAGS by the gcc-sysroot feature. However, when the makespec is reloaded, it can overwrite QMAKE_CXXFLAGS. Save QMAKE_CXXFLAGS before re-loading the mkspec and add it to the value from the makespec, like we do for CONFIG. Fixes: QTBUG-74326 Change-Id: Ie1fb713e2ffc9641d6db8c682bc5175581cd5b5f Reviewed-by: Oswald Buddenhagen Reviewed-by: Kai Koehne --- configure.pri | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure.pri') diff --git a/configure.pri b/configure.pri index 629ca78ff1..131aa868c2 100644 --- a/configure.pri +++ b/configure.pri @@ -448,7 +448,9 @@ defineTest(reloadSpec) { $$[QT_HOST_DATA/src]/mkspecs/features/mac/toolchain.prf \ $$[QT_HOST_DATA/src]/mkspecs/features/toolchain.prf - _SAVED_CONFIG = $$CONFIG + saved_variables = CONFIG QMAKE_CXXFLAGS + for (name, saved_variables): \ + _SAVED_$$name = $$eval($$name) load(spec_pre) # qdevice.pri gets written too late (and we can't write it early # enough, as it's populated in stages, with later ones depending @@ -457,7 +459,8 @@ defineTest(reloadSpec) { eval($$l) include($$QMAKESPEC/qmake.conf) load(spec_post) - CONFIG += $$_SAVED_CONFIG + for (name, saved_variables): \ + $$name += $$eval(_SAVED_$$name) load(default_pre) # ensure pristine environment for configuration. again. -- cgit v1.2.3