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

Merge pull request #6356 from hug-dev/asm-include-flags 

Add include search path when preprocessing assembly files for uvision and make_armc5 exports
pull/6260/merge
Cruz Monrreal 2018-03-19 16:52:18 -05:00 committed by GitHub
parent 4840e4d3e1 ebc9289d30
commit f6bcbfe1f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,10 @@ 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())
# Add the virtual path the the include option in the ASM flags
for index, flag in enumerate(ctx['asm_flags']):
if flag.startswith('-I'):
ctx['asm_flags'][index] = "-I" + ctx['vpath'][0] + "/" + ctx['asm_flags'][index][2:]
for templatefile in \ for templatefile in \
['makefile/%s_%s.tmpl' % (self.TEMPLATE, ['makefile/%s_%s.tmpl' % (self.TEMPLATE,

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>