From cc2284cca12e7b8a1153b4d1f46484f4c79ba5c3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 22 Mar 2010 17:39:00 +1100 Subject: build: python 2.4 doesn't support multiple union arguments for sets --- buildtools/wafsamba/samba_deps.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 3e65be84b7..689bccadf6 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -547,9 +547,11 @@ def break_dependency_loops(bld, tgt_list): for loop in loops.copy(): t = bld.name_to_obj(loop, bld.env) if t.samba_type in ['SUBSYSTEM']: - loops[loop] = loops[loop].union(t.indirect_objects, t.direct_objects) + loops[loop] = loops[loop].union(t.indirect_objects) + loops[loop] = loops[loop].union(t.direct_objects) if t.samba_type in ['LIBRARY']: - loops[loop] = loops[loop].union(t.indirect_libs, t.direct_libs) + loops[loop] = loops[loop].union(t.indirect_libs) + loops[loop] = loops[loop].union(t.direct_libs) if loop in loops[loop]: loops[loop].remove(loop) -- cgit