From a973c5f2806d8ccf47871c5f325be50d2537951d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 22 Mar 2010 17:31:27 +1100 Subject: build: expand indirect syslibs after loop unrolling otherwide python libs in the disable-shared build don't get all the needed syslibs --- buildtools/wafsamba/samba_deps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 533d68b54e..3e65be84b7 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -525,7 +525,6 @@ def break_dependency_loops(bld, tgt_list): for t in tgt_list: indirect_objects(bld, t, set(), loops) indirect_libs(bld, t, set(), loops) - indirect_syslibs(bld, t, set(), loops) includes_objects(bld, t, set(), inc_loops) # break the loops @@ -570,6 +569,9 @@ def break_dependency_loops(bld, tgt_list): debug('deps: setting %s %s to %s', t.sname, attr, objs) setattr(t, attr, objs) + # now calculate the indirect syslibs, which can change from the loop expansion + for t in tgt_list: + indirect_syslibs(bld, t, set(), loops) def calculate_final_deps(bld, tgt_list, loops): -- cgit