diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2022-07-31 03:11:53 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-08-03 09:54:39 +0000 |
| commit | 235bb0a2b96d5c93a15641d152da30ce769f39f9 (patch) | |
| tree | e8c8c9eca4a53e5aa592c8b4b058fd05bfb3b8df | |
| parent | b1175100caaa8e9449d483f8c7661c05bc7002f1 (diff) | |
Fix passing linker scripts to iar and keil toolchains
Those toolchains expect separate parameters for linker script flag
and script itself.
This amends ff04acd64d85d460e0f52a7ead233ae503e616d7.
Fixes: QBS-1704
Change-Id: Icd7028be89457ea539b5edae9c572bffdad6d997
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | changelogs/changes-1.23.1.md | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/iar.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/keil.js | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelogs/changes-1.23.1.md b/changelogs/changes-1.23.1.md index 4eaf62221..7b936f313 100644 --- a/changelogs/changes-1.23.1.md +++ b/changelogs/changes-1.23.1.md @@ -1,6 +1,7 @@ # C/C++ Support * Added support for c17 and c2x values in cpp.cLanguageVersion. * Added support for cpp.cLanguageVersion for the MSVC toolchain. +* Fix passing linker scripts to iar and keil toolchains (QBS-1704). # Qt Support * Adapted to new location of qscxmlc in Qt 6.3. diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js index 632f9af17..d5f019cbc 100644 --- a/share/qbs/modules/cpp/iar.js +++ b/share/qbs/modules/cpp/iar.js @@ -682,7 +682,7 @@ function linkerFlags(project, product, inputs, outputs) { args = args.concat(Cpp.collectLibraryDependenciesArguments(product)); // Linker scripts. - args = args.concat(Cpp.collectLinkerScriptPathsArguments(product, inputs)); + args = args.concat(Cpp.collectLinkerScriptPathsArguments(product, inputs, true)); // Silent output generation flag. args.push(product.cpp.linkerSilentFlag); diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js index 3ef416d56..8f3297aa2 100644 --- a/share/qbs/modules/cpp/keil.js +++ b/share/qbs/modules/cpp/keil.js @@ -818,7 +818,7 @@ function linkerFlags(project, product, inputs, outputs) { args = args.concat(Cpp.collectLibraryDependenciesArguments(product)); // Linker scripts. - args = args.concat(Cpp.collectLinkerScriptPathsArguments(product, inputs)); + args = args.concat(Cpp.collectLinkerScriptPathsArguments(product, inputs, true)); // Map file generation flag. if (product.cpp.generateLinkerMapFile) |