diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-03-13 10:34:46 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-03-24 07:23:32 +0000 |
| commit | d8323376670fdc65e4a4a654def8b78b650bdbe7 (patch) | |
| tree | 4dd93b6586ae75441709dec974ada2c734e5c763 /configure.pri | |
| parent | 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e (diff) | |
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 <oswald.buddenhagen@gmx.de>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 7 |
1 files changed, 5 insertions, 2 deletions
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. |