Skip to content

Commit

Permalink
Merge pull request ARMmbed#12400 from rajkan01/armc5_build_tool_excep…
Browse files Browse the repository at this point in the history
…tion

Add an exception for ARMC5 toolchain build
  • Loading branch information
0xc0170 authored Feb 11, 2020
2 parents c1eaf2c + 03d57b7 commit bb86c0e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
7 changes: 4 additions & 3 deletions tools/build_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target
from .libraries import Library
from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
from .toolchains.arm import ARMC5_MIGRATION_WARNING
from .toolchains.arm import UARM_TOOLCHAIN_WARNING
from .config import Config

Expand Down Expand Up @@ -242,9 +241,11 @@ def find_valid_toolchain(target, toolchain):
).format(toolchain_name, search_path)
else:
if toolchain_name == "ARMC5":
end_warnings.append(ARMC5_MIGRATION_WARNING)
raise NotSupportedException(
"Arm Compiler 5 is no longer supported, please upgrade to Arm Compiler 6."
)
if (
toolchain_name in ["uARM", "ARMC5", "ARMC6"]
toolchain_name in ["uARM", "ARMC6"]
and "uARM" in {toolchain_name, target.default_toolchain}
):
end_warnings.append(UARM_TOOLCHAIN_WARNING)
Expand Down
8 changes: 0 additions & 8 deletions tools/toolchains/arm.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@
from tools.utils import mkdir, NotSupportedException, run_cmd
from tools.resources import FileRef

ARMC5_MIGRATION_WARNING = (
"Warning: We noticed that you are using Arm Compiler 5. "
"We are deprecating the use of Arm Compiler 5. "
"Please upgrade your environment to Arm Compiler 6 "
"which is free to use with Mbed OS. For more information, "
"please visit https://os.mbed.com/docs/mbed-os/latest/tools/index.html"
)

UARM_TOOLCHAIN_WARNING = (
"Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. "
"We are deprecating the use of the uARM Toolchain. "
Expand Down

0 comments on commit bb86c0e

Please sign in to comment.