diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-10-14 15:02:03 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-10-15 12:53:40 +0000 |
| commit | e8a3d192fb56c4aad70237ca5a3934e976e6e1a6 (patch) | |
| tree | 71efec90971005fd54f81de49500c820b4784405 | |
| parent | c7701a6a84dec6480e11cd4952e3da73204fd8d8 (diff) | |
| download | qbs-e8a3d192fb56c4aad70237ca5a3934e976e6e1a6.tar.gz | |
baremetal: Fix detection for IAR compiler include paths
We need to return an approproate compiler include paths
depending on the language tag ('cpp' or 'c').
Change-Id: I5b526cf67a8e2300bf9302862ed67535866997ee
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/imports/qbs/Probes/IarProbe.qbs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/share/qbs/imports/qbs/Probes/IarProbe.qbs b/share/qbs/imports/qbs/Probes/IarProbe.qbs index 687ceae87..3a65c208f 100644 --- a/share/qbs/imports/qbs/Probes/IarProbe.qbs +++ b/share/qbs/imports/qbs/Probes/IarProbe.qbs @@ -59,10 +59,13 @@ PathProbe { if (!languages || languages.length === 0) languages = ["c"]; + var defaultPathsByLanguage = {}; for (var i = 0; i < languages.length; ++i) { var tag = languages[i]; compilerDefinesByLanguage[tag] = IAR.dumpMacros( compilerFilePath, tag); + var paths = IAR.dumpDefaultPaths(compilerFilePath, tag); + defaultPathsByLanguage[tag] = paths; } var macros = compilerDefinesByLanguage["c"] @@ -71,10 +74,8 @@ PathProbe { architecture = IAR.guessArchitecture(macros); endianness = IAR.guessEndianness(macros); - // FIXME: Do we need dump the default paths for both C - // and C++ languages? - var defaultPaths = IAR.dumpDefaultPaths( - compilerFilePath, languages[0]); + var defaultPaths = defaultPathsByLanguage["cpp"] + || defaultPathsByLanguage["c"]; includePaths = defaultPaths.includePaths; |