FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use ASMPATH_ST for for assembler includes.

This commit is contained in:
alexrp 2012-09-18 23:54:02 +02:00
parent 2a95fc745d
commit cf4a6abbd2
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waflib/Tools/asm.py
View File

@ -45,7 +45,7 @@ class asm(Task.Task):
Compile asm files by gas/nasm/yasm/...
"""
color = 'BLUE'
run_str = '${AS} ${ASFLAGS} ${CPPPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}'
run_str = '${AS} ${ASFLAGS} ${ASMPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}'
@extension('.s', '.S', '.asm', '.ASM', '.spp', '.SPP')
def asm_hook(self, node):
@ -71,3 +71,5 @@ class asmstlib(stlink_task):
"Link object files into a c static library"
pass # do not remove
def configure(conf):
conf.env['ASMPATH_ST'] = '-I%s'

1
waflib/Tools/gas.py
View File

@ -15,3 +15,4 @@ def configure(conf):
conf.env.AS_TGT_F = ['-c', '-o']
conf.env.ASLNK_TGT_F = ['-o']
conf.find_ar()
conf.load('asm')

1
waflib/Tools/nasm.py
View File

@ -21,3 +21,4 @@ def configure(conf):
nasm = conf.find_program(['nasm', 'yasm'], var='AS')
conf.env.AS_TGT_F = ['-o']
conf.env.ASLNK_TGT_F = ['-o']
conf.load('asm')