FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 18:07:12 +01:00
Code Issues Projects Releases Wiki Activity

ti_cgt: do not alter LINKFLAGS, but append objects

Browse Source
This commit is contained in:
Jerome Carretero 2012-02-07 22:45:16 -05:00
parent 1ec508d1cd
commit 8f9ee6f547
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
waflib/extras/ticgt.py
View File

@ -225,7 +225,7 @@ def apply_tconf(self):
task.path = self.path task.path = self.path
task.includes = includes task.includes = includes
task.cwd = target_node.parent.abspath() task.cwd = target_node.parent.abspath()
task.env = self.env task.env = self.env.derive()
task.env["TCONFSRC"] = node.path_from(target_node.parent) task.env["TCONFSRC"] = node.path_from(target_node.parent)
task.env["TCONFINC"] = '-Dconfig.importPath=%s' % ";".join(importpaths) task.env["TCONFINC"] = '-Dconfig.importPath=%s' % ";".join(importpaths)
task.env['TCONFPROGNAME'] = '-Dconfig.programName=%s' % target task.env['TCONFPROGNAME'] = '-Dconfig.programName=%s' % target
@ -238,10 +238,11 @@ def apply_tconf(self):
s62task = create_compiled_task(self, 'ti_c', task.outputs[1]) s62task = create_compiled_task(self, 'ti_c', task.outputs[1])
ctask = create_compiled_task(self, 'ti_c', task.outputs[0]) ctask = create_compiled_task(self, 'ti_c', task.outputs[0])
ctask.env.LINKFLAGS += [target_node.change_ext("cfg.cmd").abspath()] ctask.env = self.env.derive()
if len(sources) > 1:
ctask.env.LINKFLAGS += [sources[1].bldpath()]
self.add_those_o_files(target_node.change_ext("cfg.cmd"))
if len(sources) > 1:
self.add_those_o_files(sources[1])
self.source = [] self.source = []
re_tconf_include = re.compile(r'(?P<type>utils\.importFile)\("(?P<file>.*)"\)',re.M) re_tconf_include = re.compile(r'(?P<type>utils\.importFile)\("(?P<file>.*)"\)',re.M)
@ -272,6 +273,3 @@ class ti_tconf(Task.Task):
return nodes, names return nodes, names
return deps(self.inputs[0]) return deps(self.inputs[0])
return (nodes, names)