summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-21 17:44:32 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-21 19:03:27 +1100
commit7ffb781e81ef15bed730a8c2c3ddc4280485ee9f (patch)
treef9971f06652459b2c8cfa830fb4b013e2da1395e
parent0966776b363ac7a66a5d22c05d474e35e6994c68 (diff)
downloadsamba-7ffb781e81ef15bed730a8c2c3ddc4280485ee9f.tar.gz
samba-7ffb781e81ef15bed730a8c2c3ddc4280485ee9f.tar.bz2
samba-7ffb781e81ef15bed730a8c2c3ddc4280485ee9f.zip
waf-python: make the pyext flag add the pyembed features for libraries
this is rather strange, but we get build errors without it. There may be a bug in the waf python tool, or I may misunderstand how to use it
-rw-r--r--buildtools/wafsamba/wafsamba.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 280ffd6ee2..7108715555 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -184,7 +184,9 @@ def SAMBA_LIBRARY(bld, libname, source,
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
features += ' pyext'
- if pyembed:
+ if pyext or pyembed:
+ # this is quite strange. we should add pyext feature for pyext
+ # but that breaks the build. This may be a bug in the waf python tool
features += ' pyembed'
if abi_file:
features += ' abi_check'