summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-10-09 23:00:08 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-10-10 14:02:56 +0000
commit91a727ec4957eca21d93d117a2e725bb5b3a9f5d (patch)
tree30f59bc4dfbb8d173f988e5076e80de12f8b1395
parent39ddab6b69fb3bbd14c5aa019e31271c65e6f16c (diff)
baremetal: Don't interpret BL51 linker warnings as errors
BL51 linker (from Keil product for 8051 architecture) ends with the exit code '1' in case any linking warning occurred. It is not an error, because at errors the linker ends with the exit code '2'. So, we need just to increase the value of the linking command 'maxExitCode' property from 0 to 1, similar to the compiler command handling. Change-Id: I4917d08ca3407c8046879780e4c8696fdef7736a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--share/qbs/modules/cpp/keil.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js
index 4e40a3e64..4bf6e4b79 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -756,9 +756,11 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
var primaryOutput = outputs.application[0];
var args = linkerFlags(project, product, input, outputs);
var linkerPath = product.cpp.linkerPath;
+ var architecture = product.cpp.architecture;
var cmd = new Command(linkerPath, args);
cmd.description = "linking " + primaryOutput.fileName;
cmd.highlight = "linker";
+ cmd.maxExitCode = getMaxExitCode(architecture);
filterStdOutput(cmd);
return [cmd];
}