ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Version check the compiler in all build functions 

This enables the use of Mbed Studio's version of ARMC6.
pull/10114/head
Brian Daniels 2019-03-19 17:37:48 -05:00
parent 9824c3ccc3
commit 6e629ded84
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/build_api.py
View File

@ -607,6 +607,7 @@ def build_library(src_paths, build_path, target, toolchain_name,
src_paths, build_path, target, toolchain_name, macros=macros, src_paths, build_path, target, toolchain_name, macros=macros,
clean=clean, jobs=jobs, notify=notify, app_config=app_config, clean=clean, jobs=jobs, notify=notify, app_config=app_config,
build_profile=build_profile, ignore=ignore) build_profile=build_profile, ignore=ignore)
toolchain.version_check()
# The first path will give the name to the library # The first path will give the name to the library
if name is None: if name is None:
@ -781,6 +782,7 @@ def build_lib(lib_id, target, toolchain_name, clean=False, macros=None,
src_paths, tmp_path, target, toolchain_name, macros=macros, src_paths, tmp_path, target, toolchain_name, macros=macros,
notify=notify, build_profile=build_profile, jobs=jobs, clean=clean, notify=notify, build_profile=build_profile, jobs=jobs, clean=clean,
ignore=ignore) ignore=ignore)
toolchain.version_check()
notify.info("Building library %s (%s, %s)" % notify.info("Building library %s (%s, %s)" %
(name.upper(), target.name, toolchain_name)) (name.upper(), target.name, toolchain_name))
@ -925,6 +927,7 @@ def build_mbed_libs(target, toolchain_name, clean=False, macros=None,
toolchain = prepare_toolchain( toolchain = prepare_toolchain(
[""], tmp_path, target, toolchain_name, macros=macros, notify=notify, [""], tmp_path, target, toolchain_name, macros=macros, notify=notify,
build_profile=build_profile, jobs=jobs, clean=clean, ignore=ignore) build_profile=build_profile, jobs=jobs, clean=clean, ignore=ignore)
toolchain.version_check()
config = toolchain.config config = toolchain.config
config.add_config_files([MBED_CONFIG_FILE]) config.add_config_files([MBED_CONFIG_FILE])