diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-13 11:41:13 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-13 11:41:20 +1000 |
| commit | 0ca484f4573275808a209ccb0a94a30e89b336d2 (patch) | |
| tree | b18d851a0f83146ae6c693b7a4f38da82092a203 | |
| parent | b7ffc6e5b228d21f547bec77f378f0fdc88b6dd2 (diff) | |
| download | samba-0ca484f4573275808a209ccb0a94a30e89b336d2.tar.gz samba-0ca484f4573275808a209ccb0a94a30e89b336d2.tar.bz2 samba-0ca484f4573275808a209ccb0a94a30e89b336d2.zip | |
build: check the type of implied dependencies
an implied dependency needs to be a library or module
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index cca2febda9..fbc322383f 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -339,8 +339,14 @@ def build_direct_deps(bld, tgt_list): for implied in TO_LIST(syslib_deps[d]): if BUILTIN_LIBRARY(bld, implied): t.direct_objects.add(implied) - else: + elif targets[implied] == 'SYSLIB': + t.direct_syslibs.add(implied) + elif targets[implied] in ['LIBRARY', 'MODULE']: t.direct_libs.add(implied) + else: + Logs.error('Implied dependency %s in %s is of type %s' % ( + implied, t.sname, targets[implied])) + sys.exit(1) continue t2 = bld.name_to_obj(d, bld.env) if t2 is None: @@ -486,6 +492,11 @@ def includes_objects(bld, t, chain, inc_loops): continue chain.add(lib) t2 = bld.name_to_obj(lib, bld.env) + if t2 is None: + targets = LOCAL_CACHE(bld, 'TARGET_TYPE') + Logs.error('Target %s of type %s not found in direct_libs for %s' % ( + lib, targets[lib], t.sname)) + sys.exit(1) r2 = includes_objects(bld, t2, chain, inc_loops) chain.remove(lib) ret = ret.union(t2.direct_objects) |