summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-30 22:28:30 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:19 +1000
commitd39b44c98986ab4b15c81350b4e4ee0ee2d60601 (patch)
tree174f19623624b051f8c0b38892e4d01efce4a06b /buildtools
parent178b0d178d55863dde29713230ae3af69452e58b (diff)
downloadsamba-d39b44c98986ab4b15c81350b4e4ee0ee2d60601.tar.gz
samba-d39b44c98986ab4b15c81350b4e4ee0ee2d60601.tar.bz2
samba-d39b44c98986ab4b15c81350b4e4ee0ee2d60601.zip
build: python libs need to be built shared, regardless of --disable-shared
we don't have a way to load them otherwise
Diffstat (limited to 'buildtools')
-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 3f48de4ca6..51d85731eb 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -100,7 +100,7 @@ def SAMBA_LIBRARY(bld, libname, source,
SET_TARGET_TYPE(bld, libname, 'EMPTY')
return
- if BUILTIN_LIBRARY(bld, libname):
+ if target_type != 'PYTHON' and BUILTIN_LIBRARY(bld, libname):
obj_target = libname
else:
obj_target = libname + '.objlist'
@@ -122,7 +122,7 @@ def SAMBA_LIBRARY(bld, libname, source,
needs_python = needs_python,
local_include = local_include)
- if BUILTIN_LIBRARY(bld, libname):
+ if libname == obj_target:
return
if not SET_TARGET_TYPE(bld, libname, target_type):