From e683ac6f81306a03d8fe6bedeb5ca1a6facd6f1f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 12 Apr 2010 00:21:21 -0600 Subject: 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 --- buildtools/wafsamba/samba_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba_utils.py') 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)) -- cgit