waf: fixed expansion of direct_objects and direct_libs
authorAndrew Tridgell <tridge@samba.org>
Wed, 20 Oct 2010 07:17:52 +0000 (18:17 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 08:03:23 +0000 (19:03 +1100)
these do not need to be expanded in break_dependency_loops()

buildtools/wafsamba/samba_deps.py

index 22d4efd6ad3971cd06f387e23ed1d3ddd076a640..c022fc7dbfbc7c07bc325a0c11742e754d39c79e 100644 (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)