summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildtools/wafsamba/samba_bundled.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 34199381b3..e0a8e54eae 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -15,14 +15,25 @@ def BUNDLED_NAME(bld, name, bundled_extension):
return name
+def target_in_list(target, lst, default):
+ for l in lst:
+ if target == l:
+ return True
+ if '!' + target == l:
+ return False
+ if l == 'ALL':
+ return True
+ if l == 'NONE':
+ return False
+ return default
+
+
def BUILTIN_LIBRARY(bld, name):
'''return True if a library should be builtin
instead of being built as a shared lib'''
if bld.env.DISABLE_SHARED:
return True
- if name in bld.env.BUILTIN_LIBRARIES:
- return True
- return False
+ return target_in_list(name, bld.env.BUILTIN_LIBRARIES, False)
def BUILTIN_DEFAULT(opt, builtins):