summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-20 18:17:52 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-21 19:03:23 +1100
commite596a4e6c3598d0045c330a595bd0a05b6c33bb7 (patch)
treefbd896e31ed14a5aab7d80a746927c37a4588e87
parentcd7190b802b4c4c645a7973156833b2a17db1965 (diff)
downloadsamba-e596a4e6c3598d0045c330a595bd0a05b6c33bb7.tar.gz
samba-e596a4e6c3598d0045c330a595bd0a05b6c33bb7.tar.bz2
samba-e596a4e6c3598d0045c330a595bd0a05b6c33bb7.zip
waf: fixed expansion of direct_objects and direct_libs
these do not need to be expanded in break_dependency_loops()
-rw-r--r--buildtools/wafsamba/samba_deps.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 22d4efd6ad..c022fc7dbf 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -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)