diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-08 16:06:36 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-11 09:23:53 +0000 |
| commit | a86215cab101caa0bac1f9c70b15c62c601bb34e (patch) | |
| tree | 6a312019053e7c5ffc83902ffa7c8ca29dac8dcb /share/qbs/modules/cpp/GenericGCC.qbs | |
| parent | 30d724ad339e30055f72c0264833d1cd4e5f9122 (diff) | |
Fix GCC support for "bare metal" systems again
This was fixed before in 8176a4d419 and broken again in 72eedbb0a4. Fix
it for good this time using module priorities.
Task-number: QBS-1263
Change-Id: Ib1702299ef6c51b19a9082da96485ef5387dc1bb
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 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 86fd64874..113587e60 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -41,11 +41,12 @@ import qbs.WindowsUtils import 'gcc.js' as Gcc CppModule { - condition: false + condition: qbs.toolchain && qbs.toolchain.contains("gcc") + priority: -100 Probes.BinaryProbe { id: compilerPathProbe - condition: !toolchainInstallPath + condition: !toolchainInstallPath && !_skipAllChecks names: [toolchainPrefix ? toolchainPrefix + compilerName : compilerName] } @@ -60,6 +61,7 @@ CppModule { Probes.GccProbe { id: gccProbe + condition: !_skipAllChecks compilerFilePathByLanguage: compilerPathByLanguage enableDefinesByLanguage: enableCompilerDefinesByLanguage environment: buildEnv @@ -69,7 +71,7 @@ CppModule { Probes.BinaryProbe { id: binutilsProbe - condition: !File.exists(archiverPath) + condition: !File.exists(archiverPath) && !_skipAllChecks names: Gcc.toolNames([archiverName, assemblerName, linkerName, nmName, objcopyName, stripName], toolchainPrefix) } @@ -83,6 +85,7 @@ CppModule { Probe { id: nmProbe + condition: !_skipAllChecks property string theNmPath: nmPath property bool hasDynamicOption configure: { @@ -262,6 +265,8 @@ CppModule { } validate: { + if (_skipAllChecks) + return; if (!File.exists(compilerPath)) { var pathMessage = FileInfo.isAbsolutePath(compilerPath) ? "at '" + compilerPath + "'" |