diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-12 00:21:21 -0600 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-12 17:47:29 +1000 |
| commit | e683ac6f81306a03d8fe6bedeb5ca1a6facd6f1f (patch) | |
| tree | 8a575c9d592143b5d2e796c1324624e22a7b809e | |
| parent | d70a7befb6dd2168c31a657fc0c6ab3b5f69c91e (diff) | |
| download | samba-e683ac6f81306a03d8fe6bedeb5ca1a6facd6f1f.tar.gz samba-e683ac6f81306a03d8fe6bedeb5ca1a6facd6f1f.tar.bz2 samba-e683ac6f81306a03d8fe6bedeb5ca1a6facd6f1f.zip | |
build: allow target upgrades from EMPTY to SYSLIB
A library may be initially set as empty if it wasn't needed for a list
of functions in CHECK_FUNCS_IN(). A later check may require the
library.
Pair-Programmed-With: Kai Blin <kai@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index fcd900dec1..60c505717b 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -449,7 +449,7 @@ def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True): liblist = TO_LIST(libs) ret = True for lib in liblist[:]: - if GET_TARGET_TYPE(conf, lib): + if GET_TARGET_TYPE(conf, lib) == 'SYSLIB': continue (ccflags, ldflags) = library_flags(conf, lib) diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 8016da44bc..7ee1663513 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -15,7 +15,7 @@ LIB_PATH="shared" def SET_TARGET_TYPE(ctx, target, value): '''set the target type of a target''' cache = LOCAL_CACHE(ctx, 'TARGET_TYPE') - if target in cache: + if target in cache and cache[target] != 'EMPTY': ASSERT(ctx, cache[target] == value, "Target '%s' re-defined as %s - was %s" % (target, value, cache[target])) debug("task_gen: Skipping duplicate target %s (curdir=%s)" % (target, ctx.curdir)) |