diff options
| author | Stefan Metzmacher <metze@samba.org> | 2021-08-20 16:25:02 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2021-11-30 15:53:34 +0000 |
| commit | 38ef29bc219afcd608a1c87f8aae99cebe79b665 (patch) | |
| tree | bdba4168d22efb3e2983280484f6aa669c7078bc /buildtools/wafsamba | |
| parent | 295e5270f60296feb4e9bbb57ae3b3f58f2d3258 (diff) | |
| download | samba-38ef29bc219afcd608a1c87f8aae99cebe79b665.tar.gz | |
wafsamba: let reduce_objects() not remove duplicates of BUILTINS even if there are more than one
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14780
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'buildtools/wafsamba')
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index cb8acfae34e..8d76e2e434e 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -718,8 +718,12 @@ def reduce_objects(bld, tgt_list): dup = dup.difference(rely_on[t.sname]) if dup: # Do not remove duplicates of BUILTINS - d = next(iter(dup)) - if BUILTIN_LIBRARY(bld, d): + for d in iter(dup.copy()): + if BUILTIN_LIBRARY(bld, d): + debug('deps: BUILTIN_LIBRARY SKIP: removing dups from %s of type %s: %s also in %s %s', + t.sname, t.samba_type, d, t2.samba_type, l) + dup.remove(d) + if len(dup) == 0: continue debug('deps: removing dups from %s of type %s: %s also in %s %s', |