diff options
Diffstat (limited to 'buildtools/wafsamba/symbols.py')
| -rw-r--r-- | buildtools/wafsamba/symbols.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index daa18b95cdc..d37cce23a01 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -251,7 +251,7 @@ def build_symbol_sets(bld, tgt_list): bld.env.public_symbols[name] = t.public_symbols if t.samba_type == 'LIBRARY': for dep in t.add_objects: - t2 = bld.name_to_obj(dep, bld.env) + t2 = bld.get_tgen_by_name(dep) bld.ASSERT(t2 is not None, "Library '%s' has unknown dependency '%s'" % (name, dep)) bld.env.public_symbols[name] = bld.env.public_symbols[name].union(t2.public_symbols) @@ -264,7 +264,7 @@ def build_symbol_sets(bld, tgt_list): bld.env.used_symbols[name] = t.used_symbols if t.samba_type == 'LIBRARY': for dep in t.add_objects: - t2 = bld.name_to_obj(dep, bld.env) + t2 = bld.get_tgen_by_name(dep) bld.ASSERT(t2 is not None, "Library '%s' has unknown dependency '%s'" % (name, dep)) bld.env.used_symbols[name] = bld.env.used_symbols[name].union(t2.used_symbols) @@ -362,7 +362,7 @@ def build_autodeps(bld, t): if targets[depname[0]] in [ 'SYSLIB' ]: deps.add(depname[0]) continue - t2 = bld.name_to_obj(depname[0], bld.env) + t2 = bld.get_tgen_by_name(depname[0]) if len(t2.in_library) != 1: deps.add(depname[0]) continue @@ -385,7 +385,7 @@ def build_library_names(bld, tgt_list): for t in tgt_list: if t.samba_type in [ 'LIBRARY' ]: for obj in t.samba_deps_extended: - t2 = bld.name_to_obj(obj, bld.env) + t2 = bld.get_tgen_by_name(obj) if t2 and t2.samba_type in [ 'SUBSYSTEM', 'ASN1' ]: if not t.sname in t2.in_library: t2.in_library.append(t.sname) @@ -402,7 +402,7 @@ def check_library_deps(bld, t): Logs.warn("WARNING: Target '%s' in multiple libraries: %s" % (t.sname, t.in_library)) for dep in t.autodeps: - t2 = bld.name_to_obj(dep, bld.env) + t2 = bld.get_tgen_by_name(dep) if t2 is None: continue for dep2 in t2.autodeps: @@ -435,7 +435,7 @@ def check_syslib_collisions(bld, tgt_list): def check_dependencies(bld, t): '''check for depenencies that should be changed''' - if bld.name_to_obj(t.sname + ".objlist", bld.env): + if bld.get_tgen_by_name(t.sname + ".objlist"): return targets = LOCAL_CACHE(bld, 'TARGET_TYPE') @@ -475,7 +475,7 @@ def check_dependencies(bld, t): def check_syslib_dependencies(bld, t): '''check for syslib depenencies''' - if bld.name_to_obj(t.sname + ".objlist", bld.env): + if bld.get_tgen_by_name(t.sname + ".objlist"): return sname = real_name(t.sname) |