diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-17 11:23:48 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-19 14:38:38 +0000 |
commit | 6655d563c3cac6dbfd61bfb3dd15ae5b9467d5ae (patch) | |
tree | 106e67560ce0ca9955d3523c74df0c8fa46e671c /share/qbs/modules/cpp/GenericGCC.qbs | |
parent | 13e8c5371709c9e1c337c664062aec19930c306b (diff) |
GCC: Provide a Probe environment only if the compiler needs one
Of our existing backends, only QCC has that requirement.
The old code caused enormous slowness on Darwin, because the build
environment there contains product-specific values.
Task-number: QBS-1277
Change-Id: Ie26c148ff49030eb2626324d6a9f658a794dda23
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
-rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 37fbaf263..5676d62e0 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -57,7 +57,7 @@ CppModule { Probes.GccVersionProbe { id: gccVersionProbe compilerFilePath: compilerPath - environment: buildEnv + environment: probeEnv } Probes.GccProbe { @@ -65,10 +65,11 @@ CppModule { condition: !_skipAllChecks compilerFilePathByLanguage: compilerPathByLanguage enableDefinesByLanguage: enableCompilerDefinesByLanguage - environment: buildEnv + environment: probeEnv flags: targetDriverFlags.concat(sysrootFlags) _sysroot: sysroot } + property var probeEnv Probes.BinaryProbe { id: binutilsProbe |