aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-05-14 13:11:03 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-05-14 13:58:37 +0000
commitbf56ef80ef3827d98be3bddf5a32477fc8a79647 (patch)
treee32dea92a0fcb246472b6ac5a14d386007e51f4b /share
parentf0092aeea998ab96f6db9b5c0761ad452a0d493a (diff)
bare-metal: Implement cpp.compilerDefinesByLanguage for SDCC toolchain
Change-Id: I934a7bf3679dfda15ef245a9d14e834dc5136861 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/imports/qbs/Probes/SdccProbe.qbs6
-rw-r--r--share/qbs/modules/cpp/sdcc.qbs2
2 files changed, 7 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/Probes/SdccProbe.qbs b/share/qbs/imports/qbs/Probes/SdccProbe.qbs
index 864dc45bc..b5f7d384e 100644
--- a/share/qbs/imports/qbs/Probes/SdccProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/SdccProbe.qbs
@@ -43,8 +43,11 @@ PathProbe {
property int versionMinor;
property int versionPatch;
property stringList includePaths;
+ property var compilerDefinesByLanguage;
configure: {
+ compilerDefinesByLanguage = {};
+
if (!File.exists(compilerFilePath)) {
found = false;
return;
@@ -52,6 +55,9 @@ PathProbe {
var macros = SDCC.dumpMacros(compilerFilePath, preferredArchitecture);
+ // SDCC it is only the C language compiler.
+ compilerDefinesByLanguage["c"] = macros;
+
architecture = SDCC.guessArchitecture(macros);
endianness = SDCC.guessEndianness(macros);
diff --git a/share/qbs/modules/cpp/sdcc.qbs b/share/qbs/modules/cpp/sdcc.qbs
index 901539bfc..a0d795b40 100644
--- a/share/qbs/modules/cpp/sdcc.qbs
+++ b/share/qbs/modules/cpp/sdcc.qbs
@@ -60,7 +60,7 @@ CppModule {
compilerVersionPatch: sdccProbe.versionPatch
endianness: sdccProbe.endianness
- compilerDefinesByLanguage: []
+ compilerDefinesByLanguage: sdccProbe.compilerDefinesByLanguage
compilerIncludePaths: sdccProbe.includePaths
property string toolchainInstallPath: compilerPathProbe.found