aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-07-31 15:01:37 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-07-31 13:27:05 +0000
commitde5db8cfb87f7c54fddd6d9ecc124cd33201de2a (patch)
tree79a81402a8d83826d533f2102d1cb2446d7cda21
parent140d26dc7d8efc673fb77768a19242ae81ae334f (diff)
cpp module: Fix the GCC compiler path probe
The toolchain prefix was missing in the compiler file name, which lead to interesting effects, as the probe would potentially detect a wrong toolchain install path. Change-Id: I09fe63c5b9860506fe86ade60a74851d428438c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--share/qbs/modules/cpp/GenericGCC.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index b25de28c0..8a83f9d5e 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -46,7 +46,7 @@ CppModule {
Probes.BinaryProbe {
id: compilerPathProbe
condition: !toolchainInstallPath
- names: [compilerName]
+ names: [toolchainPrefix ? toolchainPrefix + compilerName : compilerName]
}
// Find the version as early as possible in case other things depend on it,