diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-04-02 23:02:11 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-04-03 11:45:28 +0000 |
commit | d1ad96d31b06f173e5bf494aad322a4790528e88 (patch) | |
tree | 58d35079c541e1821786dacf0bcb9735a0d26f92 /share/qbs/imports/qbs/Probes | |
parent | d34440c27a51fa0eb89ca94e927a33e13676df08 (diff) |
Fix autodetecting mingw compiler in PATH
GccBinaryProbe failed to locate g++.exe since it tried to append ".exe"
suffix which is already present in filename.
Also, fix the emptyProfile() test by setting the qbs.toolchainType
instead of read-only property "qbs.toolchain" which cannot be assigned
from the command line.
Also, prepend the original cpp.toolchainInstallPath value to the PATH
variable to make sure Probe will find the desired compiler.
Change-Id: I12341ee1cd4d8ea0cbcdf3781347bfc0a2780ad2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/Probes')
-rw-r--r-- | share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs b/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs index 02caad501..9081f5efb 100644 --- a/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs +++ b/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs @@ -3,6 +3,7 @@ import qbs.FileInfo import "path-probe.js" as PathProbeConfigure BinaryProbe { + nameSuffixes: undefined // _compilerName already contains ".exe" suffix on Windows // Inputs property string _compilerName property string _toolchainPrefix |