diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-06-26 20:11:05 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-06-28 17:18:04 +0000 |
| commit | dea1145d214a0bc4f082f0588b7272334b6a182a (patch) | |
| tree | d80c580a20b44d8a9cbe4939c232b66813a1f573 /tests | |
| parent | 3545a25377330fb49f7a4aeacbf0bfe21adf04b2 (diff) | |
baremetal: Fix {c|cpp}LanguageVersion handling on KEIL ARM Clang toolchain
We need to skip the 'undefined' language version returned from
the Cpp.languageVersion() function.
Change-Id: I3345c2fbdde8b50c8fb9035ec10ca21e0024e6d3
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs | 10 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs index 774fe708d..43c4043dd 100644 --- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs +++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs @@ -1,6 +1,14 @@ CppApplication { Properties { - condition: qbs.toolchain.contains("keil") && qbs.architecture.startsWith("arm") + condition: qbs.toolchain.contains("keil") + && qbs.architecture.startsWith("arm") + && cpp.compilerName.startsWith("armcc") cpp.driverFlags: ["--cpu", "cortex-m0"] } + Properties { + condition: qbs.toolchain.contains("keil") + && qbs.architecture.startsWith("arm") + && cpp.compilerName.startsWith("armclang") + cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] + } } diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs index a5a3ea272..ffb4fe685 100644 --- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs +++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs @@ -1,6 +1,14 @@ StaticLibrary { Properties { - condition: qbs.toolchain.contains("keil") && qbs.architecture.startsWith("arm") + condition: qbs.toolchain.contains("keil") + && qbs.architecture.startsWith("arm") + && cpp.compilerName.startsWith("armcc") cpp.driverFlags: ["--cpu", "cortex-m0"] } + Properties { + condition: qbs.toolchain.contains("keil") + && qbs.architecture.startsWith("arm") + && cpp.compilerName.startsWith("armclang") + cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] + } } |