Skip to content

Commit 5a4c5df

Browse files
committed
[tools] Reordered option handling in toolchains
Options were parsed and logged before per-toolchain logging was setup. Fixes #1990
1 parent f864b84 commit 5a4c5df

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tools/toolchains/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,6 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,
233233
# compile/assemble/link/binary hooks
234234
self.hook = hooks.Hook(target, self)
235235

236-
# Build options passed by -o flag
237-
self.options = options if options is not None else []
238-
self.options.extend(BUILD_OPTIONS)
239-
if self.options:
240-
self.info("Build Options: %s" % (', '.join(self.options)))
241-
242236
# Toolchain flags
243237
self.flags = deepcopy(self.DEFAULT_FLAGS)
244238

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

289283
# Print output buffer
290284
self.output = ""
285+
286+
# Build options passed by -o flag
287+
self.options = options if options is not None else []
288+
self.options.extend(BUILD_OPTIONS)
289+
if self.options:
290+
self.info("Build Options: %s" % (', '.join(self.options)))
291291

292292
# uVisor spepcific rules
293293
if 'UVISOR' in self.target.features and 'UVISOR_SUPPORTED' in self.target.extra_labels:

0 commit comments

Comments
 (0)