|
47 | 47 | from .libraries import Library |
48 | 48 | from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS |
49 | 49 | from .toolchains.arm import ARMC5_MIGRATION_WARNING |
50 | | -from .toolchains.arm import UARM_TOOLCHAIN_WARNING |
| 50 | +from .toolchains.arm import UARM_TOOLCHAIN_WARNING, UARM_DEFAULT_TOOLCHAIN_WARNING |
51 | 51 | from .config import Config |
52 | 52 |
|
53 | 53 | RELEASE_VERSIONS = ['2', '5'] |
@@ -234,17 +234,21 @@ def find_valid_toolchain(target, toolchain): |
234 | 234 | last_error = None |
235 | 235 | for index, toolchain_name in enumerate(toolchain_names): |
236 | 236 | internal_tc_name = get_toolchain_name(target, toolchain_name) |
237 | | - if toolchain == "ARM" and toolchain_name == "ARMC5" and index != 0: |
| 237 | + if toolchain_name == "ARMC5": |
238 | 238 | end_warnings.append(ARMC5_MIGRATION_WARNING) |
| 239 | + if target.default_toolchain == "uARM": |
| 240 | + end_warnings.append(UARM_DEFAULT_TOOLCHAIN_WARNING) |
239 | 241 | if not TOOLCHAIN_CLASSES[internal_tc_name].check_executable(): |
240 | 242 | search_path = TOOLCHAIN_PATHS[internal_tc_name] or "No path set" |
241 | 243 | last_error = ( |
242 | 244 | "Could not find executable for {}.\n" |
243 | 245 | "Currently set search path: {}" |
244 | 246 | ).format(toolchain_name, search_path) |
245 | 247 | else: |
246 | | - if toolchain_name == "uARM" or target.default_toolchain == "uARM": |
247 | | - end_warnings.append(UARM_TOOLCHAIN_WARNING) |
| 248 | + if toolchain_name == "uARM": |
| 249 | + end_warnings.append(UARM_TOOLCHAIN_WARNING) |
| 250 | + elif toolchain_name == "ARMC6" and target.default_toolchain == "uARM": |
| 251 | + end_warnings.append(UARM_DEFAULT_TOOLCHAIN_WARNING) |
248 | 252 | return toolchain_name, internal_tc_name, end_warnings |
249 | 253 | else: |
250 | 254 | if last_error: |
|
0 commit comments