Skip to content

Commit f5230cd

Browse files
committed
Refactor condition check
1 parent 816516e commit f5230cd

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

tools/build_api.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def find_valid_toolchain(target, toolchain):
233233
toolchain_names = get_valid_toolchain_names(target, toolchain)
234234
last_error = None
235235
for index, toolchain_name in enumerate(toolchain_names):
236-
internal_tc_name = get_toolchain_name(target, toolchain_name)
236+
internal_tc_name = get_toolchain_name(target, toolchain_name)
237237
if not TOOLCHAIN_CLASSES[internal_tc_name].check_executable():
238238
search_path = TOOLCHAIN_PATHS[internal_tc_name] or "No path set"
239239
last_error = (
@@ -243,12 +243,9 @@ def find_valid_toolchain(target, toolchain):
243243
else:
244244
if toolchain_name in ["uARM", "ARMC5", "ARMC6"]:
245245
if toolchain_name == "ARMC5":
246-
end_warnings.append(ARMC5_MIGRATION_WARNING)
247-
if (
248-
toolchain_name == "uARM"
249-
or target.default_toolchain == "uARM"
250-
):
251-
end_warnings.append(UARM_TOOLCHAIN_WARNING)
246+
end_warnings.append(ARMC5_MIGRATION_WARNING)
247+
if "uARM" in {toolchain_name, target.default_toolchain}:
248+
end_warnings.append(UARM_TOOLCHAIN_WARNING)
252249
return toolchain_name, internal_tc_name, end_warnings
253250
else:
254251
if last_error:

0 commit comments

Comments
 (0)