diff options
| -rw-r--r-- | configure.json | 3 | ||||
| -rw-r--r-- | configure.pri | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.json b/configure.json index b4a87f5505..07514992d1 100644 --- a/configure.json +++ b/configure.json @@ -211,7 +211,7 @@ "testTypeDependencies": { "linkerSupportsFlag": [ "use_gold_linker" ], - "verifySpec": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot", "qmakeargs", "commit" ], + "verifySpec": [ "shared", "use_gold_linker", "compiler-flags", "qmakeargs", "commit" ], "compile": [ "verifyspec" ], "detectPkgConfig": [ "cross_compile", "machineTuple" ], "library": [ "pkg-config" ], @@ -518,6 +518,7 @@ "features": { "prepare": { + "condition": "features.gcc-sysroot || true", "output": [ "prepareSpec", "prepareOptions", "preparePaths", "reloadSpec" ] }, "machineTuple": { diff --git a/configure.pri b/configure.pri index f1c63f575d..ec03504488 100644 --- a/configure.pri +++ b/configure.pri @@ -1069,6 +1069,10 @@ defineTest(qtConfOutput_gccSysroot) { "\"QMAKE_LFLAGS += --sysroot=$$config.input.sysroot\"" export(EXTRA_QMAKE_ARGS) + # This one is for qtConfToolchainSupportsFlag(). + QMAKE_CXXFLAGS += --sysroot=$$config.input.sysroot + export(QMAKE_CXXFLAGS) + output = \ "!host_build {" \ " QMAKE_CFLAGS += --sysroot=\$\$[QT_SYSROOT]" \ diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c4ddda5b1f..2ddcda58b1 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -344,7 +344,7 @@ defineReplace(qtConfToolchainSupportsFlag) { conftest = "int main() { return 0; }" write_file("$$test_out_dir/conftest.cpp", conftest)|error() - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $${1} -o conftest-out conftest.cpp"): \ + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $$QMAKE_CXXFLAGS $${1} -o conftest-out conftest.cpp"): \ return(true) return(false) } |