diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-08-29 16:24:16 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-08-31 08:43:45 +0000 |
commit | 666ff77372ad1c7899bf6317e14bcd4caebdc957 (patch) | |
tree | 2329acd177ed5332faa3c213799dc2ab9c2f5114 /share/qbs/modules/cpp/iar.js | |
parent | 8ae09626519df5410e6c4964950bc848c7ff02b6 (diff) | |
download | qbs-666ff77372ad1c7899bf6317e14bcd4caebdc957.tar.gz |
Extract compiler macros using common JS function
It makes sense to unify the compiler macros extraction using
a common JS function, instead of a JS code duplication.
Change-Id: I9eb9e8df012ca6bae3a38101906a4c70e2fc38c4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp/iar.js')
-rw-r--r-- | share/qbs/modules/cpp/iar.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js index 0c912d0aa..bbb0faf3a 100644 --- a/share/qbs/modules/cpp/iar.js +++ b/share/qbs/modules/cpp/iar.js @@ -377,12 +377,7 @@ function dumpMacros(compilerFilePath, tag) { var p = new Process(); p.exec(compilerFilePath, args, true); var outFile = new TextFile(outFilePath, TextFile.ReadOnly); - var map = {}; - outFile.readAll().trim().split(/\r?\n/g).map(function (line) { - var parts = line.split(" ", 3); - map[parts[1]] = parts[2]; - }); - return map; + return ModUtils.extractMacros(outFile.readAll()); } function dumpDefaultPaths(compilerFilePath, tag) { |