FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-12-23 17:55:04 +01:00
Code Issues Projects Releases Wiki Activity

ccroot: alter add_objects_from_tgen which was too restrictive

Browse Source 
The code was talking about filtering out .pdb but it was filtering out anything
that is not in .{o,obj}, preventing from injecting weird objects in the link task.
This commit is contained in:
Jerome Carretero 2012-02-07 22:47:43 -05:00
parent e70cd20398
commit 5c3f6c680b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
waflib/Tools/ccroot.py
View File

@ -342,10 +342,22 @@ def process_use(self):
if not self.env['STLIB_' + k] and not k in self.uselib:
self.uselib.append(k)
def filtered_object(self, node):
"""
Determines which objects are not to be used by the link task.
"""
return self.env.DEST_BINFMT == 'pe' and x.name.endswith('.pdb')
@taskgen_method
def add_objects_from_tgen(self, tg):
# Not public yet, wait for waf 1.6.7 at least - the purpose of this is to add pdb files to the compiled
# tasks but not to the link tasks (to avoid errors)
"""
Add the objects from the depending compiled tasks as link task inputs.
Some objects are filtered: for instance, .pdb files are added
to the compiled tasks but not to the link tasks (to avoid errors)
"""
# Not public yet, wait for waf 1.6.12 at least
try:
link_task = self.link_task
except AttributeError:
@ -353,7 +365,7 @@ def add_objects_from_tgen(self, tg):
else:
for tsk in getattr(tg, 'compiled_tasks', []):
for x in tsk.outputs:
if x.name.endswith('.o') or x.name.endswith('.obj'):
if not filtered_object(self, x):
link_task.inputs.append(x)
@taskgen_method