From 156bdc4b95d7edc45dec648f6f7857332e40aaf4 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Tue, 19 Feb 2019 20:45:36 +0200 Subject: [PATCH] Add config header to assembly compilation ARMC6 was not including mbed_config.h when compiling assembly files --- tools/toolchains/arm.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py index df615a8d15..945bad5bee 100644 --- a/tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -473,14 +473,13 @@ class ARMC6(ARM_STD): def get_compile_options(self, defines, includes, for_asm=False): opts = ['-D%s' % d for d in defines] opts.extend(["-I%s" % i for i in includes if i]) + config_header = self.get_config_header() + if config_header: + opts.extend(self.get_config_option(config_header)) if for_asm: return ["--cpreproc", "--cpreproc_opts=%s" % ",".join(self.flags['common'] + opts)] - else: - config_header = self.get_config_header() - if config_header: - opts.extend(self.get_config_option(config_header)) - return opts + return opts @hook_tool def assemble(self, source, object, includes):