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

diff --git a/examples/baremetal/pca10001/greenblink/greenblink.qbs b/examples/baremetal/pca10001/greenblink/greenblink.qbs
index 1a4dabde710c1a1f5d26b97471c4e14ecb20520c..06a969e9fb0f15be7cdde645e160da8c528f0f2c 100644 (file)
--- 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 2ae3dc2a12122abb58d12932b9ce45e7e36e78e6..3688088498353238d5fc970fb346cfa183a1cd63 100644 (file)
--- 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 18fe8e53677accbc731416c322aac10c63804770..be9019d6bb66f767fd2bb9ca8fe1a41ad2abd5a8 100644 (file)
--- 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 f2e1dfcc9d552d478177f394ac440f30ea5cf342..d66c22dab70045e49048c6a62ad6f71c323f93bb 100644 (file)
--- 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 eaddef3400fc676aed95363ffe8d04a421df8e56..403c6e42fc678e83fd1ebc03fef9689c3206ccfb 100644 (file)
--- 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"