Refactor the if condition check

pull/12198/head
Rajkumar Kanagaraj 2020-01-16 04:31:38 -08:00
parent f5230cd70c
commit 434f50ec0b
1 changed files with 8 additions and 6 deletions

View File

@ -241,10 +241,12 @@ def find_valid_toolchain(target, toolchain):
"Currently set search path: {}" "Currently set search path: {}"
).format(toolchain_name, search_path) ).format(toolchain_name, search_path)
else: else:
if toolchain_name in ["uARM", "ARMC5", "ARMC6"]:
if toolchain_name == "ARMC5": if toolchain_name == "ARMC5":
end_warnings.append(ARMC5_MIGRATION_WARNING) end_warnings.append(ARMC5_MIGRATION_WARNING)
if "uARM" in {toolchain_name, target.default_toolchain}: if (
toolchain_name in ["uARM", "ARMC5", "ARMC6"]
and "uARM" in {toolchain_name, target.default_toolchain}
):
end_warnings.append(UARM_TOOLCHAIN_WARNING) end_warnings.append(UARM_TOOLCHAIN_WARNING)
return toolchain_name, internal_tc_name, end_warnings return toolchain_name, internal_tc_name, end_warnings
else: else: