diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-11-17 12:32:21 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-11-18 06:57:49 +0000 |
| commit | 06d88841b98f5a3de45ae9b52b6f049c6f1b2c39 (patch) | |
| tree | 19bb8be3466a5b62f410ac26fcbe23a80c9cab21 | |
| parent | e8b186610738a16fe8ddaacd39797d863828c7aa (diff) | |
| download | qbs-06d88841b98f5a3de45ae9b52b6f049c6f1b2c39.tar.gz | |
baremetal: Fix dumping of compiler includes for IAR toolchain
Change-Id: I176db33bcd1ea270e890f8422d10bc5133c891bf
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/modules/cpp/iar.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js index 22eb53441..f1c41fe64 100644 --- a/share/qbs/modules/cpp/iar.js +++ b/share/qbs/modules/cpp/iar.js @@ -412,12 +412,9 @@ function dumpDefaultPaths(compilerFilePath, tag) { if (pass === 1) continue; - var parts = output.substring(startQuoteIndex + 1, endQuoteIndex).split("\n"); - var includePath = ""; - for (var i in parts) - includePath += parts[i].trim(); - - includePaths.push(includePath); + var path = output.substring(startQuoteIndex + 1, endQuoteIndex) + .replace(/[\s]{2,}/g, ' '); + includePaths.push(path); } return { |