do not use -specs=nosys.specs on Debian ARM architectures

Forwarded: not-needed
Last-Update: 2020-09-20

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/pca10040/greenblink/greenblink.qbs b/examples/baremetal/pca10040/greenblink/greenblink.qbs
index b0d7f832eaf243a6ff6631fdc0b36564464dac4f..528dd3e7fa22feaeeceb4c0b9cfd3248f525bf23 100644 (file)
--- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
+++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
@@ -54,9 +54,7 @@ CppApplication {
     condition: {
         if (!qbs.architecture.startsWith("arm"))
             return false;
-        return (qbs.toolchain.contains("gcc")
-                || 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 530e38fcf602a1ed1495b0c93149482e2959c212..491315692fa2bdf9be752047a1c411e1c7ad4248 100644 (file)
--- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
@@ -54,9 +54,7 @@ CppApplication {
     condition: {
         if (!qbs.architecture.startsWith("arm"))
             return false;
-        return (qbs.toolchain.contains("gcc")
-                || 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 254901e0e9fb72f8040d75accc9041ee8ed688d4..70bd0683f97db5bc76bd730ac347aec509d76435 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/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
index fa678ebb2b53544a1c7b7446a2eb7c2809bd7851..a433bdd3ee3286cc75b88ec19ed9c2637e2a5478 100644 (file)
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
@@ -81,11 +81,6 @@ CppApplication {
         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"

diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
index 5604551628600879e076fdc8000b8e5530b955f7..bf41f4f8835308754a16629af0d93e77ce05021b 100644 (file)
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
@@ -81,11 +81,6 @@ StaticLibrary {
         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"