diff options
| -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)) |