Merge pull request #6540 from theotherjimmy/compile-check

Cruz Monrreal · web-flow · commit b33ab748a7a7 · 2018-04-24T12:12:38.000-05:00
Prevent compiling with unsupported compilers
diff --git a/tools/build_api.py b/tools/build_api.py
@@ -289,6 +289,13 @@ def get_mbed_official_release(version):
 
     return mbed_official_release
 
+ARM_COMPILERS = ("ARM", "ARMC6", "uARM")
+def target_supports_toolchain(target, toolchain_name):
+    if toolchain_name in ARM_COMPILERS:
+        return any(tc in target.supported_toolchains for tc in ARM_COMPILERS)
+    else:
+        return toolchain_name in target.supported_toolchains
+
 
 def prepare_toolchain(src_paths, build_dir, target, toolchain_name,
                       macros=None, clean=False, jobs=1,
@@ -322,6 +329,11 @@ def prepare_toolchain(src_paths, build_dir, target, toolchain_name,
     # If the configuration object was not yet created, create it now
     config = config or Config(target, src_paths, app_config=app_config)
     target = config.target
+    if not target_supports_toolchain(target, toolchain_name):
+        raise NotSupportedException(
+            "Target {} is not supported by toolchain {}".format(
+                target.name, toolchain_name))
+
     try:
         cur_tc = TOOLCHAIN_CLASSES[toolchain_name]
     except KeyError:
diff --git a/tools/test/config/app_override_libs/targets.json b/tools/test/config/app_override_libs/targets.json
@@ -3,6 +3,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_toolchains": ["GCC_ARM"]
     }
 }
diff --git a/tools/test/config/compound_inheritance/targets.json b/tools/test/config/compound_inheritance/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
diff --git a/tools/test/config/double_define/targets.json b/tools/test/config/double_define/targets.json
@@ -1,5 +1,6 @@
 {
     "first_base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
@@ -10,6 +11,7 @@
         }
     },
     "second_base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
diff --git a/tools/test/config/feature_compesition/targets.json b/tools/test/config/feature_compesition/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
diff --git a/tools/test/config/feature_recursive_add/targets.json b/tools/test/config/feature_recursive_add/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
diff --git a/tools/test/config/feature_recursive_complex/targets.json b/tools/test/config/feature_recursive_complex/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
diff --git a/tools/test/config/feature_remove/targets.json b/tools/test/config/feature_remove/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": ["IPV4"],
diff --git a/tools/test/config/feature_uvisor/targets.json b/tools/test/config/feature_uvisor/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
diff --git a/tools/test/config/macro_inheritance/targets.json b/tools/test/config/macro_inheritance/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
diff --git a/tools/test/config/override_labels_libs/targets.json b/tools/test/config/override_labels_libs/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0"
diff --git a/tools/test/config/override_labels_libs_more/targets.json b/tools/test/config/override_labels_libs_more/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0"
diff --git a/tools/test/config/override_labels_targets/targets.json b/tools/test/config/override_labels_targets/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
diff --git a/tools/test/config/override_precidence/targets.json b/tools/test/config/override_precidence/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
diff --git a/tools/test/config/override_undefined/targets.json b/tools/test/config/override_undefined/targets.json
@@ -1,5 +1,6 @@
 {
     "first_base_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
@@ -21,6 +22,7 @@
         }
     },
     "second_base_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "config": {
             "base2_1": "v_base2_1_b2",
             "base2_2": "v_base2_2_b2"
diff --git a/tools/test/config/override_undefined_libs/targets.json b/tools/test/config/override_undefined_libs/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0"
diff --git a/tools/test/config/override_with_labels/targets.json b/tools/test/config/override_with_labels/targets.json
@@ -1,5 +1,6 @@
 {
     "base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0"
diff --git a/tools/test/config/simple_features/targets.json b/tools/test/config/simple_features/targets.json
@@ -1,5 +1,6 @@
 {
     "test_target": {
+        "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
diff --git a/tools/test/config/simple_iheritance/targets.json b/tools/test/config/simple_iheritance/targets.json
@@ -1,5 +1,6 @@
 {
     "first_base": {
+        "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
         "core": "Cortex-M0",
@@ -21,6 +22,7 @@
         }
     },
     "second_base": {
+        "supported_toolchains": ["GCC_ARM"],
         "config": {
             "base2_1": "v_base2_1_b2",
             "base2_2": "v_base2_2_b2"

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"core": "Cortex-M0",`
`4`	`4`	`"extra_labels": [],`
`5`	`5`	`"features": [],`
`6`		`- "default_lib": "std"`
	`6`	`+ "default_lib": "std",`
	`7`	`+ "supported_toolchains": ["GCC_ARM"]`
`7`	`8`	`}`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"base": {`
	`3`	`+ "supported_toolchains": ["GCC_ARM"],`
`3`	`4`	`"extra_labels": [],`
`4`	`5`	`"default_lib": "std",`
`5`	`6`	`"core": "Cortex-M0",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"first_base": {`
	`3`	`+ "supported_toolchains": ["GCC_ARM"],`
`3`	`4`	`"extra_labels": [],`
`4`	`5`	`"default_lib": "std",`
`5`	`6`	`"core": "Cortex-M0",`
`@@ -10,6 +11,7 @@`
`10`	`11`	`}`
`11`	`12`	`},`
`12`	`13`	`"second_base": {`
	`14`	`+ "supported_toolchains": ["GCC_ARM"],`
`13`	`15`	`"extra_labels": [],`
`14`	`16`	`"default_lib": "std",`
`15`	`17`	`"core": "Cortex-M0",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"test_target": {`
	`3`	`+ "supported_toolchains": ["GCC_ARM"],`
`3`	`4`	`"core": "Cortex-M0",`
`4`	`5`	`"extra_labels": [],`
`5`	`6`	`"features": [],`