ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8305 from theotherjimmy/fix-microbit-release 

Tools: Fix Microbit releases
pull/8364/merge
Cruz Monrreal 2018-10-10 08:44:58 -05:00 committed by GitHub
parent 5a47318bc2 a270249aa7
commit 43ffe3e985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/toolchains/arm.py
View File

@ -60,7 +60,7 @@ class ARM(mbedToolchain):
raise NotSupportedException( raise NotSupportedException(
"this compiler does not support the core %s" % target.core) "this compiler does not support the core %s" % target.core)
if getattr(target, "default_lib", "std") == "small": if getattr(target, "default_toolchain", "ARM") == "uARM":
if "-DMBED_RTOS_SINGLE_THREAD" not in self.flags['common']: if "-DMBED_RTOS_SINGLE_THREAD" not in self.flags['common']:
self.flags['common'].append("-DMBED_RTOS_SINGLE_THREAD") self.flags['common'].append("-DMBED_RTOS_SINGLE_THREAD")
if "-D__MICROLIB" not in self.flags['common']: if "-D__MICROLIB" not in self.flags['common']:
@ -125,7 +125,7 @@ class ARM(mbedToolchain):
}) })
def _get_toolchain_labels(self): def _get_toolchain_labels(self):
if getattr(self.target, "default_lib", "std") == "small": if getattr(self.target, "default_toolchain", "ARM") == "uARM":
return ["ARM", "ARM_MICRO"] return ["ARM", "ARM_MICRO"]
else: else:
return ["ARM", "ARM_STD"] return ["ARM", "ARM_STD"]
@ -350,7 +350,7 @@ class ARM_MICRO(ARM):
def __init__(self, target, notify=None, macros=None, def __init__(self, target, notify=None, macros=None,
silent=False, extra_verbose=False, build_profile=None, silent=False, extra_verbose=False, build_profile=None,
build_dir=None): build_dir=None):
target.default_lib = "small" target.default_toolchain = "uARM"
ARM.__init__(self, target, notify, macros, build_dir=build_dir, ARM.__init__(self, target, notify, macros, build_dir=build_dir,
build_profile=build_profile) build_profile=build_profile)
if not set(("ARM", "uARM")).intersection(set(target.supported_toolchains)): if not set(("ARM", "uARM")).intersection(set(target.supported_toolchains)):