summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-05-07 00:49:13 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-08 10:59:18 +0200
commit7e4ba48135608b5c93cfa4e15f5e4e2c0788d61e (patch)
tree0354ab37e20805e977814a869b9643a932eea736
parent958368efd0f0db4a0e77f6a374d3c7b5056105c6 (diff)
downloadsamba-7e4ba48135608b5c93cfa4e15f5e4e2c0788d61e.tar.gz
samba-7e4ba48135608b5c93cfa4e15f5e4e2c0788d61e.tar.xz
samba-7e4ba48135608b5c93cfa4e15f5e4e2c0788d61e.zip
build: allow s3 libraries to be built with no undefined symbols
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--buildtools/wafsamba/samba3.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index cb459ad115a..e44e28bba90 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -89,13 +89,15 @@ def s3_fix_kwargs(bld, kwargs):
def SAMBA3_LIBRARY(bld, name, *args, **kwargs):
s3_fix_kwargs(bld, kwargs)
- kwargs['allow_undefined_symbols'] = True
+ if not 'allow_undefined_symbols' in kwargs:
+ kwargs['allow_undefined_symbols'] = True
return bld.SAMBA_LIBRARY(name, *args, **kwargs)
Build.BuildContext.SAMBA3_LIBRARY = SAMBA3_LIBRARY
def SAMBA3_MODULE(bld, name, *args, **kwargs):
s3_fix_kwargs(bld, kwargs)
- kwargs['allow_undefined_symbols'] = True
+ if not 'allow_undefined_symbols' in kwargs:
+ kwargs['allow_undefined_symbols'] = True
return bld.SAMBA_MODULE(name, *args, **kwargs)
Build.BuildContext.SAMBA3_MODULE = SAMBA3_MODULE