diff options
| author | Andreas Schneider <asn@samba.org> | 2018-12-17 21:40:55 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-12-20 12:16:39 +0100 |
| commit | 7eaa59686bb9707678d3dba2f8e9565b91256235 (patch) | |
| tree | 785df57915ff343f7e74f7812119b7f50b72c11b /buildtools | |
| parent | 7a35a6874add19277647fff70c0d730ef1efa85a (diff) | |
| download | samba-7eaa59686bb9707678d3dba2f8e9565b91256235.tar.gz | |
wafsamba: Do not remove BUILTINS as duplicates
BUILTINS add object files to the target, so we can't remove them as
duplicates.
The issue e.g happens when tevent wants to link libreplace:
20:04:10 deps removing dups from tevent of type LIBRARY: {'replace'}
also in LIBRARY talloc
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index d6b7c0f88d6..f8c38809bd2 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -719,6 +719,11 @@ def reduce_objects(bld, tgt_list): if t.sname in rely_on: dup = dup.difference(rely_on[t.sname]) if dup: + # Do not remove duplicates of BUILTINS + d = next(iter(dup)) + if BUILTIN_LIBRARY(bld, d): + continue + debug('deps: removing dups from %s of type %s: %s also in %s %s', t.sname, t.samba_type, dup, t2.samba_type, l) new = new.difference(dup) |