aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-05-16 20:22:34 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-05-19 11:58:22 +0000
commitdf7de9f0c333364d08bec0fddd273256a60a3dd1 (patch)
tree469e95bddf41b73e8845e31197a9cb34467ec9d9
parent272a83e2a2ee96e8866663fe8c06dfe455dfc7c2 (diff)
baremetal: Pass '--cpu' flag at ARM predefined macros dumping
... using the KEIL toolchain. Since KEIL MDK v5.30 the 'armcc' compiler require the '--cpu' property be set. So, as a workaround we pass the default 'cortex-m0' property (by analogy with the 'armclang' compiler). Change-Id: I334f3cbb801eaf2f3958b59afbddbf5f026066ee Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-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 69e97c13f..af57bb0fa 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -453,7 +453,7 @@ function dumpC166CompilerMacros(compilerFilePath, tag) {
}
function dumpArmCCCompilerMacros(compilerFilePath, tag, nullDevice) {
- var args = [ "-E", "--list-macros", nullDevice ];
+ var args = [ "-E", "--list-macros", "--cpu=cortex-m0", nullDevice ];
if (tag === "cpp")
args.push("--cpp");