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

Correct uvision template to correctly pass include paths

pull/5093/head
Jimmy Brisson 2017-09-14 09:37:29 -05:00
parent 8db0fa9819
commit a62f89da05
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/export/uvision/__init__.py
View File

@ -167,8 +167,9 @@ class Uvision(Exporter):
"""Format toolchain flags for Uvision""" """Format toolchain flags for Uvision"""
flags = copy.deepcopy(self.flags) flags = copy.deepcopy(self.flags)
# to be preprocessed with armcc # to be preprocessed with armcc
asm_flag_string = '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' + \ asm_flag_string = (
",".join(flags['asm_flags']) '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' +
",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags'])))
flags['asm_flags'] = asm_flag_string flags['asm_flags'] = asm_flag_string
# All non-asm flags are in one template field # All non-asm flags are in one template field
c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags'])) c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags']))

2
tools/export/uvision/uvision.tmpl
View File

@ -394,7 +394,7 @@
<MiscControls>{{asm_flags}}</MiscControls> <MiscControls>{{asm_flags}}</MiscControls>
<Define></Define> <Define></Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath></IncludePath> <IncludePath>{{include_paths}}</IncludePath>
</VariousControls> </VariousControls>
</Aads> </Aads>
<LDads> <LDads>