summaryrefslogtreecommitdiff
path: root/share/qbs/modules/cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-06-16 21:34:24 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-06-17 16:28:00 +0000
commit9f5aea6c730b3cc775d69b0a7795f38e26eaf80e (patch)
tree2b40b43e4612f5ea039fe5bda6206cc3b89ac858 /share/qbs/modules/cpp
parent372b41cd5c335101177a88e3e16952e536626cc0 (diff)
downloadqbs-9f5aea6c730b3cc775d69b0a7795f38e26eaf80e.tar.gz
baremetal: Fix static library creation from multiple objects for KEIL toolchain
The problem was in that the 'input' parameter becomes undefined for a multiple input files. We need to use the 'product' parameter instead. Tested for MCS51 architecture. Change-Id: I147d8d9b483dc6c567669364375ed78ef70b94d2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp')
-rw-r--r--share/qbs/modules/cpp/keil.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js
index 0f38a7328..d88f8bed6 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -1178,7 +1178,7 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
function prepareArchiver(project, product, inputs, outputs, input, output) {
var args = archiverFlags(project, product, input, outputs);
var archiverPath = product.cpp.archiverPath;
- var architecture = input.cpp.architecture;
+ var architecture = product.cpp.architecture;
var cmd = new Command(archiverPath, args);
cmd.description = "linking " + output.fileName;
cmd.highlight = "linker";