diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-07-15 20:50:30 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-07-16 15:47:12 +0000 |
| commit | 059b08a44f163ec6182b50d46e949ceaf4adf8a0 (patch) | |
| tree | 3033620dbf32bd088556ca49d507fb0c3433b74b | |
| parent | ba897695f61704a88270f57bfa83419770461cfc (diff) | |
baremetal: Don't pass cpp.driverFlags to KEIL assembler
... because the cpp.driverFlags intended only for the compiler
and the linker; the assembler required the cpp.assemblerFlags
instead.
Change-Id: Ie1cca820d54095fc1361f5b9b049adc57674b3fd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/keil.js | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js index 441b49213..4cb2946a6 100644 --- a/share/qbs/modules/cpp/keil.js +++ b/share/qbs/modules/cpp/keil.js @@ -1011,8 +1011,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) { // Misc flags. args = args.concat(ModUtils.moduleProperty(input, "platformFlags", tag), - ModUtils.moduleProperty(input, "flags", tag), - ModUtils.moduleProperty(input, "driverFlags", tag)); + ModUtils.moduleProperty(input, "flags", tag)); return args; } diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs index 7335ead73..d802937d1 100644 --- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs +++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs @@ -3,6 +3,7 @@ CppApplication { condition: qbs.toolchain.contains("keil") && qbs.architecture.startsWith("arm") && cpp.compilerName.startsWith("armcc") + cpp.assemblerFlags: ["--cpu", "cortex-m0"] cpp.driverFlags: ["--cpu", "cortex-m0"] } Properties { @@ -10,7 +11,7 @@ CppApplication { && qbs.architecture.startsWith("arm") && cpp.compilerName.startsWith("armclang") cpp.assemblerFlags: ["--cpu", "cortex-m0"] - cpp.commonCompilerFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] + cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] } Properties { condition: qbs.toolchain.contains("gcc") diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs index 3c627074d..01493a5ec 100644 --- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs +++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs @@ -3,6 +3,7 @@ StaticLibrary { condition: qbs.toolchain.contains("keil") && qbs.architecture.startsWith("arm") && cpp.compilerName.startsWith("armcc") + cpp.assemblerFlags: ["--cpu", "cortex-m0"] cpp.driverFlags: ["--cpu", "cortex-m0"] } Properties { @@ -10,7 +11,7 @@ StaticLibrary { && qbs.architecture.startsWith("arm") && cpp.compilerName.startsWith("armclang") cpp.assemblerFlags: ["--cpu", "cortex-m0"] - cpp.commonCompilerFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] + cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] } Properties { condition: qbs.toolchain.contains("gcc") |