sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

waf: fixed expansion of direct_objects and direct_libs

Browse Source 
these do not need to be expanded in break_dependency_loops()
This commit is contained in:
Andrew Tridgell 2010-10-20 18:17:52 +11:00
parent cd7190b802
commit e596a4e6c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/wafsamba/samba_deps.py
View File

@ -390,7 +390,7 @@ def build_direct_deps(bld, tgt_list):
t.direct_objects = set()
t.direct_libs = set()
t.direct_syslibs = set()
deps = t.samba_deps_extended
deps = t.samba_deps_extended[:]
if getattr(t, 'samba_use_global_deps', False):
deps.extend(global_deps)
for d in deps:
@ -632,7 +632,7 @@ def break_dependency_loops(bld, tgt_list):
# add in the replacement dependencies
for t in tgt_list:
for loop in loops:
for attr in ['direct_objects', 'indirect_objects', 'direct_libs', 'indirect_libs']:
for attr in ['indirect_objects', 'indirect_libs']:
objs = getattr(t, attr, set())
if loop in objs:
diff = loops[loop].difference(objs)