get_mbed_official_release respects supported_toolchains

pull/10204/head
Brian Daniels 2019-03-22 08:29:55 -05:00 committed by adbridge
parent 12438af35d
commit 3f9e266e6d
1 changed files with 10 additions and 4 deletions

View File

@ -365,12 +365,18 @@ 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"])
if 'ARMC5' in target.supported_toolchains: if 'ARMC5' in target.supported_toolchains:
return ['ARMC5', 'GCC_ARM', 'IAR'] result = ["ARMC5"]
else: else:
return ['ARM', 'ARMC6', 'GCC_ARM', 'IAR'] result = ["ARM", "ARMC6"]
else: result.extend(
return target.supported_toolchains set(target.supported_toolchains).intersection(
non_arm_toolchains
)
)
return result
return target.supported_toolchains
else: else:
if version == '5': if version == '5':
return ['ARM', 'GCC_ARM', 'IAR'] return ['ARM', 'GCC_ARM', 'IAR']