Skip to content

Commit f8dc7c2

Browse files
committed
Modify tools to return ARMC5 or ARM for supported toolchain matrix
1 parent 51b1063 commit f8dc7c2

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

tools/build_api.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -251,20 +251,28 @@ def is_official_target(target_name, version):
251251

252252
return result, reason
253253

254-
def transform_release_toolchains(toolchains, version):
255-
""" Given a list of toolchains and a release version, return a list of
254+
def transform_release_toolchains(toolchains, version, target):
255+
""" Given a list of toolchains, release version and target(needed for checking build tools version), return a list of
256256
only the supported toolchains for that release
257257
258258
Positional arguments:
259259
toolchains - The list of toolchains
260260
version - The release version string. Should be a string contained within
261261
RELEASE_VERSIONS
262262
"""
263-
if version == '5':
264-
return ['ARM', 'GCC_ARM', 'IAR']
263+
if int(target.build_tools_metadata["version"]) > 0:
264+
if version == '5':
265+
if 'ARMC5' in toolchains:
266+
return ['ARMC5', 'GCC_ARM', 'IAR']
267+
else:
268+
return ['ARM', 'GCC_ARM', 'IAR']
269+
else:
270+
return toolchains
265271
else:
266-
return toolchains
267-
272+
if version == '5':
273+
return ['ARM', 'GCC_ARM', 'IAR']
274+
else:
275+
return toolchains
268276

269277
def get_mbed_official_release(version):
270278
""" Given a release version string, return a tuple that contains a target
@@ -283,7 +291,7 @@ def get_mbed_official_release(version):
283291
[
284292
TARGET_MAP[target].name,
285293
tuple(transform_release_toolchains(
286-
TARGET_MAP[target].supported_toolchains, version))
294+
TARGET_MAP[target].supported_toolchains, version, target))
287295
]
288296
) for target in TARGET_NAMES \
289297
if (hasattr(TARGET_MAP[target], 'release_versions')

0 commit comments

Comments
 (0)