diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-22 17:39:00 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:00 +1000 |
| commit | cc2284cca12e7b8a1153b4d1f46484f4c79ba5c3 (patch) | |
| tree | bdb1f04d57b0f7acd5d641926eb0fed166567c45 | |
| parent | 9930493cc33b8c5369fd937ff2c40db068975726 (diff) | |
| download | samba-cc2284cca12e7b8a1153b4d1f46484f4c79ba5c3.tar.gz samba-cc2284cca12e7b8a1153b4d1f46484f4c79ba5c3.tar.xz samba-cc2284cca12e7b8a1153b4d1f46484f4c79ba5c3.zip | |
build: python 2.4 doesn't support multiple union arguments for sets
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 6 |
1 files 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) |