summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba_deps.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-15 16:15:15 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:46 +1100
commit8ef9cb0bedd88177c7880f7441df77a989b7b046 (patch)
tree948f5aa0c955cbdbb368b82b724b4ad5a78ac2e4 /buildtools/wafsamba/samba_deps.py
parentb31055189ad953e2055d99caff3f8490613b96b4 (diff)
downloadsamba-8ef9cb0bedd88177c7880f7441df77a989b7b046.tar.gz
samba-8ef9cb0bedd88177c7880f7441df77a989b7b046.tar.bz2
samba-8ef9cb0bedd88177c7880f7441df77a989b7b046.zip
build: added allow_undefined_symbols options for libraries and modules
the s4 build uses linker flags to disallow undefined symbols in libraries. To accomodate s3 libraries in the top level build we need to be able to disable this on a per-library basis. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools/wafsamba/samba_deps.py')
-rw-r--r--buildtools/wafsamba/samba_deps.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 02f23183e7..a3968ada83 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -85,6 +85,10 @@ def build_dependencies(self):
new_ldflags.extend(ldflags)
self.ldflags = new_ldflags
+ if getattr(self, 'allow_undefined_symbols', False) and self.env.undefined_ldflags:
+ for f in self.env.undefined_ldflags:
+ self.ldflags.remove(f)
+
debug('deps: computed dependencies for target %s: uselib=%s uselib_local=%s add_objects=%s',
self.sname, self.uselib, self.uselib_local, self.add_objects)
@@ -954,7 +958,7 @@ def show_object_duplicates(bld, tgt_list):
# this provides a way to save our dependency calculations between runs
savedeps_version = 3
savedeps_inputs = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags',
- 'source', 'grouping_library', 'samba_ldflags']
+ 'source', 'grouping_library', 'samba_ldflags', 'allow_undefined_symbols' ]
savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags', 'ldflags', 'samba_deps_extended']
savedeps_outenv = ['INC_PATHS']
savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES', 'EXTRA_CFLAGS', 'EXTRA_LDFLAGS', 'EXTRA_INCLUDES' ]