summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-18 09:45:15 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-18 23:51:40 +0200
commite0fe9412186ab0962c672241ac386cafb25f95ef (patch)
tree854d60252a9f1abd2f1b413aba094e5eec61fca1
parentda0fb0affbf4601aca6aa83264b2c81cc9d1d4c1 (diff)
downloadsamba-e0fe9412186ab0962c672241ac386cafb25f95ef.tar.gz
samba-e0fe9412186ab0962c672241ac386cafb25f95ef.tar.bz2
samba-e0fe9412186ab0962c672241ac386cafb25f95ef.zip
wafsamba: Use BUILTIN_LIBRARY() rather than relying on side-effects.
-rw-r--r--buildtools/wafsamba/wafsamba.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index eb2d56e2db..e45544589c 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -132,7 +132,7 @@ def SAMBA_LIBRARY(bld, libname, source,
SET_TARGET_TYPE(bld, libname, 'EMPTY')
return
- if target_type != 'PYTHON' and BUILTIN_LIBRARY(bld, libname):
+ if BUILTIN_LIBRARY(bld, libname):
obj_target = libname
else:
obj_target = libname + '.objlist'
@@ -155,7 +155,7 @@ def SAMBA_LIBRARY(bld, libname, source,
hide_symbols = hide_symbols,
local_include = local_include)
- if libname == obj_target:
+ if BUILTIN_LIBRARY(bld, libname):
return
if not SET_TARGET_TYPE(bld, libname, target_type):