1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix detection of QMAKE_DEFAULT{INC|LIB}DIRS for gcc cross-builds

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2019-03-13 10:34:46 +01:00
parent 2f97a050bc
commit d832337667
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.pri
View File

@ -448,7 +448,9 @@ defineTest(reloadSpec) {
$$[QT_HOST_DATA/src]/mkspecs/features/mac/toolchain.prf \ $$[QT_HOST_DATA/src]/mkspecs/features/mac/toolchain.prf \
$$[QT_HOST_DATA/src]/mkspecs/features/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) load(spec_pre)
# qdevice.pri gets written too late (and we can't write it early # qdevice.pri gets written too late (and we can't write it early
# enough, as it's populated in stages, with later ones depending # enough, as it's populated in stages, with later ones depending
@ -457,7 +459,8 @@ defineTest(reloadSpec) {
eval($$l) eval($$l)
include($$QMAKESPEC/qmake.conf) include($$QMAKESPEC/qmake.conf)
load(spec_post) load(spec_post)
CONFIG += $$_SAVED_CONFIG for (name, saved_variables): \
$$name += $$eval(_SAVED_$$name)
load(default_pre) load(default_pre)
# ensure pristine environment for configuration. again. # ensure pristine environment for configuration. again.