diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-22 17:31:27 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:00 +1000 |
| commit | a973c5f2806d8ccf47871c5f325be50d2537951d (patch) | |
| tree | 6788f8bde38fc5d5bdb47e67e124dc2723d96a19 | |
| parent | c5d0208aa90d530270ce4a14d5bcc130ba6ab8e2 (diff) | |
| download | samba-a973c5f2806d8ccf47871c5f325be50d2537951d.tar.gz samba-a973c5f2806d8ccf47871c5f325be50d2537951d.tar.bz2 samba-a973c5f2806d8ccf47871c5f325be50d2537951d.zip | |
build: expand indirect syslibs after loop unrolling
otherwide python libs in the disable-shared build don't get all the
needed syslibs
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 4 |
1 files changed, 3 insertions, 1 deletions
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): |