ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate all flags into the FLAGS variables

pull/7559/head
Jimmy Brisson 2018-07-19 13:43:50 -05:00
parent 63f62165d8
commit c777bd6f5c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/export/makefile/__init__.py
View File

@ -88,12 +88,9 @@ class Makefile(Exporter):
if (basename(dirname(dirname(self.export_dir))) if (basename(dirname(dirname(self.export_dir)))
== "projectfiles") == "projectfiles")
else [".."]), else [".."]),
'cc_cmd': " ".join([basename(self.toolchain.cc[0])] + 'cc_cmd': basename(self.toolchain.cc[0]),
self.toolchain.cc[1:]), 'cppc_cmd': basename(self.toolchain.cppc[0]),
'cppc_cmd': " ".join([basename(self.toolchain.cppc[0])] + 'asm_cmd': basename(self.toolchain.asm[0]),
self.toolchain.cppc[1:]),
'asm_cmd': " ".join([basename(self.toolchain.asm[0])] +
self.toolchain.asm[1:]),
'ld_cmd': basename(self.toolchain.ld[0]), 'ld_cmd': basename(self.toolchain.ld[0]),
'elf2bin_cmd': basename(self.toolchain.elf2bin), 'elf2bin_cmd': basename(self.toolchain.elf2bin),
'link_script_ext': self.toolchain.LINKER_EXT, 'link_script_ext': self.toolchain.LINKER_EXT,
@ -123,6 +120,9 @@ class Makefile(Exporter):
'to_be_compiled']: 'to_be_compiled']:
ctx[key] = sorted(ctx[key]) ctx[key] = sorted(ctx[key])
ctx.update(self.format_flags()) 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 # Add the virtual path the the include option in the ASM flags
new_asm_flags = [] new_asm_flags = []