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 f5e4c3cc1dd4a57231c435e5fc5a1953ddd07e39..885f7e9115760d10b2987c5136c4b6954b995190 100644 (file)
--- a/examples/baremetal/pca10001/greenblink/greenblink.qbs
+++ b/examples/baremetal/pca10001/greenblink/greenblink.qbs
@@ -54,10 +54,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 dcf9c388ff3c6d9c9b815ba2f592eb0f503e85f8..90cae82fd27ed300d3fe96dd06b3d6c3f7677da5 100644 (file)
--- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
+++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
@@ -54,10 +54,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 d925344fb81aacb596a08c2cc92997e845c63123..0db8ac279948135ef386667afc47fecdded34f97 100644 (file)
--- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
@@ -54,10 +54,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 4a89cf68499f0a5c2006be23b2397eb75cca1a73..36ab19aa721e55ea7819eb636cf3795bd17312a5 100644 (file)
--- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
@@ -54,10 +54,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 5db9880786e8e482d267b4061f9d2abfb302d1d5..a56f7ee7e3d870423bdd42fc50ee533714bb323a 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.driverFlags: ["-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"