From df8bd4c4abc176a38d84928e69b2e4e255ac3fce Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Mon, 15 Aug 2022 12:41:45 +0100 Subject: [PATCH] do not use -specs=nosys.specs on Debian ARM architectures Forwarded: not-needed Last-Update: 2021-01-05 This requires gcc-arm-none-eabi which we do not want to depend on. Gbp-Pq: Name no_nosys_specs.diff --- examples/baremetal/pca10001/greenblink/greenblink.qbs | 5 +---- examples/baremetal/pca10040/greenblink/greenblink.qbs | 5 +---- examples/baremetal/stm32f103/greenblink/greenblink.qbs | 5 +---- examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs | 5 +---- tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs | 5 ----- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/examples/baremetal/pca10001/greenblink/greenblink.qbs b/examples/baremetal/pca10001/greenblink/greenblink.qbs index 1a4dabde..06a969e9 100644 --- a/examples/baremetal/pca10001/greenblink/greenblink.qbs +++ b/examples/baremetal/pca10001/greenblink/greenblink.qbs @@ -52,10 +52,7 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return (qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("iar") - || qbs.toolchain.contains("keil")) - && !qbs.toolchain.contains("xcode") + return false; } name: "pca10001-greenblink" cpp.cLanguageVersion: "c99" diff --git a/examples/baremetal/pca10040/greenblink/greenblink.qbs b/examples/baremetal/pca10040/greenblink/greenblink.qbs index 2ae3dc2a..36880884 100644 --- a/examples/baremetal/pca10040/greenblink/greenblink.qbs +++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs @@ -52,10 +52,7 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return (qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("iar") - || qbs.toolchain.contains("keil")) - && !qbs.toolchain.contains("xcode") + return false; } name: "pca10040-greenblink" cpp.cLanguageVersion: "c99" diff --git a/examples/baremetal/stm32f103/greenblink/greenblink.qbs b/examples/baremetal/stm32f103/greenblink/greenblink.qbs index 18fe8e53..be9019d6 100644 --- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs +++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs @@ -52,10 +52,7 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return (qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("iar") - || qbs.toolchain.contains("keil")) - && !qbs.toolchain.contains("xcode") + return false; } name: "stm32f103-greenblink" cpp.cLanguageVersion: "c99" diff --git a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs index f2e1dfcc..d66c22da 100644 --- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs +++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs @@ -52,10 +52,7 @@ CppApplication { condition: { if (!qbs.architecture.startsWith("arm")) return false; - return (qbs.toolchain.contains("gcc") - || qbs.toolchain.contains("iar") - || qbs.toolchain.contains("keil")) - && !qbs.toolchain.contains("xcode") + return false; } name: "stm32f4discovery-blueblink" cpp.cLanguageVersion: "c99" diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs index eaddef34..403c6e42 100644 --- a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs +++ b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs @@ -130,11 +130,6 @@ Product { cpp.assemblerFlags: ["--cpu", "cortex-m0"] cpp.commonCompilerFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"] } - Properties { - condition: qbs.toolchain.contains("gcc") - && qbs.architecture.startsWith("arm") - cpp.driverFlags: ["-specs=nosys.specs"] - } Properties { condition: qbs.toolchain.contains("gcc") && qbs.architecture === "xtensa" -- 2.30.2