File tree Expand file tree Collapse file tree 1 file changed +4
-7
lines changed Expand file tree Collapse file tree 1 file changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -233,7 +233,7 @@ def find_valid_toolchain(target, toolchain):
233
233
toolchain_names = get_valid_toolchain_names (target , toolchain )
234
234
last_error = None
235
235
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 )
237
237
if not TOOLCHAIN_CLASSES [internal_tc_name ].check_executable ():
238
238
search_path = TOOLCHAIN_PATHS [internal_tc_name ] or "No path set"
239
239
last_error = (
@@ -243,12 +243,9 @@ def find_valid_toolchain(target, toolchain):
243
243
else :
244
244
if toolchain_name in ["uARM" , "ARMC5" , "ARMC6" ]:
245
245
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 )
252
249
return toolchain_name , internal_tc_name , end_warnings
253
250
else :
254
251
if last_error :
You can’t perform that action at this time.
0 commit comments