aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2021-02-27 20:16:48 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2021-02-27 18:27:58 +0000
commit62bbaa0437fd16348ac15453d7c7f788407da631 (patch)
tree4f1404d61885e26122a4314402cb3da9daef886f /share
parent88a9b167a6269244811019e9bd6e3dbd0101a786 (diff)
baremetal: Report only existing compiler's include paths for IAR
... to pass the tests. Change-Id: I536a12d4da1634c8f4f02587c41e29750b64f8fc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/iar.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index 3a45d0f5e..5e5f1293f 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -533,7 +533,7 @@ function dumpCompilerIncludePaths(compilerFilePath, tag) {
var m = line.match(/\$\$INC_BEGIN\s\$\$FILEPATH\s\"([^"]*)/);
if (m) {
var includePath = m[1].replace(/\\\\/g, '/');
- if (includePath)
+ if (includePath && File.exists(includePath))
includePaths.push(includePath);
}
});
@@ -543,7 +543,8 @@ function dumpCompilerIncludePaths(compilerFilePath, tag) {
// e.g. IAR for S08 architecture. In this case we use fallback to the
// detection of the `inc` directory.
var includePath = FileInfo.joinPaths(FileInfo.path(compilerFilePath), "../inc/");
- includePaths.push(includePath);
+ if (File.exists(includePath))
+ includePaths.push(includePath);
}
return includePaths;