Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tools] Reorder option handling in toolchains #1995

Merged
merged 1 commit into from
Jun 24, 2016
Merged

[tools] Reorder option handling in toolchains #1995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tools/toolchains/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,6 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,
# compile/assemble/link/binary hooks
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
self.flags = deepcopy(self.DEFAULT_FLAGS)

Expand Down Expand Up @@ -288,6 +282,12 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,

# Print output buffer
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
if 'UVISOR' in self.target.features and 'UVISOR_SUPPORTED' in self.target.extra_labels:
Expand Down