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

Merge pull request #10398 from bridadan/official_release_changes 

Clean up ARM toolchains from get_mbed_official_release()
pull/10509/head
Martin Kojtal 2019-04-29 13:39:12 +01:00 committed by GitHub
parent 6d1b7596e6 ee174fabef
commit 39699d53be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/build_api.py
View File

@ -26,6 +26,7 @@ from shutil import rmtree
from os.path import join, exists, dirname, basename, abspath, normpath, splitext from os.path import join, exists, dirname, basename, abspath, normpath, splitext
from os.path import relpath from os.path import relpath
from os import linesep, remove, makedirs from os import linesep, remove, makedirs
from copy import copy
from time import time from time import time
from json import load, dump from json import load, dump
from jinja2 import FileSystemLoader from jinja2 import FileSystemLoader
@ -365,17 +366,13 @@ def transform_release_toolchains(target, version):
""" """
if int(target.build_tools_metadata["version"]) > 0: if int(target.build_tools_metadata["version"]) > 0:
if version == '5': if version == '5':
non_arm_toolchains = set(["IAR", "GCC_ARM"]) toolchains = copy(target.supported_toolchains)
if 'ARMC5' in target.supported_toolchains:
result = ["ARMC5"] if "ARM" in toolchains:
else: toolchains.remove("ARM")
result = ["ARM", "ARMC6"] toolchains.extend(["ARMC5", "ARMC6"])
result.extend(
set(target.supported_toolchains).intersection( return toolchains
non_arm_toolchains
)
)
return result
return target.supported_toolchains return target.supported_toolchains
else: else:
if version == '5': if version == '5':