From c777bd6f5c6969d549b6fa0561ef828bb1d11936 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 19 Jul 2018 13:43:50 -0500 Subject: [PATCH] Migrate all flags into the FLAGS variables --- tools/export/makefile/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py index 8c2c6208bee..556239ce16a 100644 --- a/tools/export/makefile/__init__.py +++ b/tools/export/makefile/__init__.py @@ -88,12 +88,9 @@ def generate(self): if (basename(dirname(dirname(self.export_dir))) == "projectfiles") else [".."]), - 'cc_cmd': " ".join([basename(self.toolchain.cc[0])] + - self.toolchain.cc[1:]), - 'cppc_cmd': " ".join([basename(self.toolchain.cppc[0])] + - self.toolchain.cppc[1:]), - 'asm_cmd': " ".join([basename(self.toolchain.asm[0])] + - self.toolchain.asm[1:]), + 'cc_cmd': basename(self.toolchain.cc[0]), + 'cppc_cmd': basename(self.toolchain.cppc[0]), + 'asm_cmd': basename(self.toolchain.asm[0]), 'ld_cmd': basename(self.toolchain.ld[0]), 'elf2bin_cmd': basename(self.toolchain.elf2bin), 'link_script_ext': self.toolchain.LINKER_EXT, @@ -123,6 +120,9 @@ def generate(self): 'to_be_compiled']: ctx[key] = sorted(ctx[key]) ctx.update(self.format_flags()) + ctx['asm_flags'].extend(self.toolchain.asm[1:]) + ctx['c_flags'].extend(self.toolchain.cc[1:]) + ctx['cxx_flags'].extend(self.toolchain.cppc[1:]) # Add the virtual path the the include option in the ASM flags new_asm_flags = []