From 33037150991a0dae0da769af8f46d1c15a27c728 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Jun 2018 21:08:57 +0200 Subject: configure: pull ahead gcc-sysroot processing the sysroot flags need to be established even before setting up the spec, because as soon as that happens, toolchain.prf will try to determine the default paths and cache them. this also fixes sysroot use in toolchain flag support tests, which run (somewhat) independently from the toolchain setup. Task-number: QTBUG-63483 Change-Id: I7be1540e766dac58fb16f63176aa8d2879b51ae0 Reviewed-by: Joerg Bornemann --- configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.json') 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": { -- cgit v1.2.3