diff options
author | Thomas Nagy <tnagy@waf.io> | 2015-11-05 00:34:03 +0100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2015-11-06 10:37:24 +0100 |
commit | 40a2deb52099c6149a072c545010093d11b0b1a7 (patch) | |
tree | f46a712160de44f933c87271a5649d141f430430 /buildtools | |
parent | bae51eb24eaf40a3bd46420945b3a5bcca2b3099 (diff) | |
download | samba-40a2deb52099c6149a072c545010093d11b0b1a7.tar.gz |
build:wafsamba: Removed unnecessary and misleading variables
There is no 'allow_duplicates' attribute anywhere.
The function 'check_duplicate_sources' always returns True unless it raises an exception
There is no list of source files to use
The variable 'tstart' is unused
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Uri Simchoni uri@samba.org
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r-- | buildtools/wafsamba/samba_deps.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index f869deec997..9e5eab728fc 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -260,15 +260,10 @@ def add_init_functions(self): def check_duplicate_sources(bld, tgt_list): - '''see if we are compiling the same source file more than once - without an allow_duplicates attribute''' + '''see if we are compiling the same source file more than once''' debug('deps: checking for duplicate sources') - targets = LOCAL_CACHE(bld, 'TARGET_TYPE') - ret = True - - global tstart for t in tgt_list: source_list = TO_LIST(getattr(t, 'source', '')) @@ -286,7 +281,6 @@ def check_duplicate_sources(bld, tgt_list): # build a list of targets that each source file is part of for t in tgt_list: - sources = [] if not targets[t.sname] in [ 'LIBRARY', 'BINARY', 'PYTHON' ]: continue for obj in t.add_objects: @@ -306,7 +300,7 @@ def check_duplicate_sources(bld, tgt_list): if len(subsystems[s][tname]) > 1: raise Utils.WafError("ERROR: source %s is in more than one subsystem of target '%s': %s" % (s, tname, subsystems[s][tname])) - return ret + return True def check_orphaned_targets(bld, tgt_list): |