diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-06-12 14:38:53 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-06-13 10:47:28 +0000 |
| commit | 6f471fc8f1a93f8dd2daa4e746f47dbeb180e10d (patch) | |
| tree | 978354de7859b7867540d2fe730deff286694d32 /share | |
| parent | a57c1da3e25a149078f4e03683eee728cb3235e5 (diff) | |
baremetal: Fix handling include paths for all IAR toolchains
This commit fixes handling for include paths properties which
are passed to the compiler or assembler arguments:
* We don't need to handle the cpp.compilerIncludePaths property.
* We need to handle the missing cpp.distributionLibraryPaths property.
Change-Id: I8ec7f02d019431c98d1659e2f2a6da4fa2506c7c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/iar.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js index 486c57827..5b9888c55 100644 --- a/share/qbs/modules/cpp/iar.js +++ b/share/qbs/modules/cpp/iar.js @@ -549,9 +549,9 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) { var systemIncludePaths = input.cpp.systemIncludePaths; if (systemIncludePaths) allIncludePaths = allIncludePaths.uniqueConcat(systemIncludePaths); - var compilerIncludePaths = input.cpp.compilerIncludePaths; - if (compilerIncludePaths) - allIncludePaths = allIncludePaths.uniqueConcat(compilerIncludePaths); + var distributionIncludePaths = input.cpp.distributionIncludePaths; + if (distributionIncludePaths) + allIncludePaths = allIncludePaths.uniqueConcat(distributionIncludePaths); args = args.concat(allIncludePaths.map(function(include) { return "-I" + include })); // Silent output generation flag. @@ -672,9 +672,9 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) { var systemIncludePaths = input.cpp.systemIncludePaths; if (systemIncludePaths) allIncludePaths = allIncludePaths.uniqueConcat(systemIncludePaths); - var compilerIncludePaths = input.cpp.compilerIncludePaths; - if (compilerIncludePaths) - allIncludePaths = allIncludePaths.uniqueConcat(compilerIncludePaths); + var distributionIncludePaths = input.cpp.distributionIncludePaths; + if (distributionIncludePaths) + allIncludePaths = allIncludePaths.uniqueConcat(distributionIncludePaths); args = args.concat(allIncludePaths.map(function(include) { return "-I" + include })); // Debug information flags. |