From 5a4c5df4dcd0338c4213911dcea9db193e0f6c76 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Wed, 22 Jun 2016 09:23:33 -0500 Subject: [PATCH] [tools] Reordered option handling in toolchains Options were parsed and logged before per-toolchain logging was setup. Fixes #1990 --- tools/toolchains/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py index f01afd7486b..148eecc46a9 100644 --- a/tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -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) @@ -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: