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 #1995 from geky/fix-debug-info 

[tools] Reorder option handling in toolchains
pull/1988/merge
Sam Grove 2016-06-23 22:34:18 -05:00 committed by GitHub
parent 5f92574163 5a4c5df4dc
commit d3a6ac3f5f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/toolchains/__init__.py
View File

@ -233,12 +233,6 @@ class mbedToolchain:
# compile/assemble/link/binary hooks # compile/assemble/link/binary hooks
self.hook = hooks.Hook(target, self) self.hook = hooks.Hook(target, self)
# Build options passed by -o flag
self.options = options if options is not None else []
self.options.extend(BUILD_OPTIONS)
if self.options:
self.info("Build Options: %s" % (', '.join(self.options)))
# Toolchain flags # Toolchain flags
self.flags = deepcopy(self.DEFAULT_FLAGS) self.flags = deepcopy(self.DEFAULT_FLAGS)
@ -289,6 +283,12 @@ class mbedToolchain:
# Print output buffer # Print output buffer
self.output = "" self.output = ""
# Build options passed by -o flag
self.options = options if options is not None else []
self.options.extend(BUILD_OPTIONS)
if self.options:
self.info("Build Options: %s" % (', '.join(self.options)))
# uVisor spepcific rules # uVisor spepcific rules
if 'UVISOR' in self.target.features and 'UVISOR_SUPPORTED' in self.target.extra_labels: if 'UVISOR' in self.target.features and 'UVISOR_SUPPORTED' in self.target.extra_labels:
self.target.core = re.sub(r"F$", '', self.target.core) self.target.core = re.sub(r"F$", '', self.target.core)