Skip to content

Commit bb86c0e

Browse files
authored
Merge pull request #12400 from rajkan01/armc5_build_tool_exception
Add an exception for ARMC5 toolchain build
2 parents c1eaf2c + 03d57b7 commit bb86c0e

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

tools/build_api.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target
4747
from .libraries import Library
4848
from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
49-
from .toolchains.arm import ARMC5_MIGRATION_WARNING
5049
from .toolchains.arm import UARM_TOOLCHAIN_WARNING
5150
from .config import Config
5251

@@ -242,9 +241,11 @@ def find_valid_toolchain(target, toolchain):
242241
).format(toolchain_name, search_path)
243242
else:
244243
if toolchain_name == "ARMC5":
245-
end_warnings.append(ARMC5_MIGRATION_WARNING)
244+
raise NotSupportedException(
245+
"Arm Compiler 5 is no longer supported, please upgrade to Arm Compiler 6."
246+
)
246247
if (
247-
toolchain_name in ["uARM", "ARMC5", "ARMC6"]
248+
toolchain_name in ["uARM", "ARMC6"]
248249
and "uARM" in {toolchain_name, target.default_toolchain}
249250
):
250251
end_warnings.append(UARM_TOOLCHAIN_WARNING)

tools/toolchains/arm.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
from tools.utils import mkdir, NotSupportedException, run_cmd
3030
from tools.resources import FileRef
3131

32-
ARMC5_MIGRATION_WARNING = (
33-
"Warning: We noticed that you are using Arm Compiler 5. "
34-
"We are deprecating the use of Arm Compiler 5. "
35-
"Please upgrade your environment to Arm Compiler 6 "
36-
"which is free to use with Mbed OS. For more information, "
37-
"please visit https://os.mbed.com/docs/mbed-os/latest/tools/index.html"
38-
)
39-
4032
UARM_TOOLCHAIN_WARNING = (
4133
"Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. "
4234
"We are deprecating the use of the uARM Toolchain. "

0 commit comments

Comments
 (0)