diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-10-10 21:20:24 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-10-11 14:57:44 +1100 |
| commit | 0f435a7adceb6bb7e2cc57eda3bf5a4a615d6a79 (patch) | |
| tree | 7a8ae3f853f62dc0b70272ee9d6e5eefbbc0b1e1 /buildtools/wafsamba/samba_bundled.py | |
| parent | 1722074a9b4b7370ae50ba7a0b787c5f325f592b (diff) | |
| download | samba-0f435a7adceb6bb7e2cc57eda3bf5a4a615d6a79.tar.gz samba-0f435a7adceb6bb7e2cc57eda3bf5a4a615d6a79.tar.bz2 samba-0f435a7adceb6bb7e2cc57eda3bf5a4a615d6a79.zip | |
build: Remove --disable-shared
This does not work, and has no known use cases. Remove it so we do
not waste time trying to support it.
This also removes it for ldb/tdb/ntdb/talloc, but as these are first
shared libraries, and then tools on top of those, rpath or (for
emergency tools) --nonshared-binary= seems more appropriate.
Andrew Bartlett
Diffstat (limited to 'buildtools/wafsamba/samba_bundled.py')
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index b8a4101dca..afcf708e10 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -30,8 +30,6 @@ def target_in_list(target, lst, 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 return target_in_list(name, bld.env.BUILTIN_LIBRARIES, False) Build.BuildContext.BUILTIN_LIBRARY = BUILTIN_LIBRARY @@ -249,8 +247,6 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): def NONSHARED_BINARY(bld, name): '''return True if a binary should be built without non-system shared libs''' - if bld.env.DISABLE_SHARED: - return True return target_in_list(name, bld.env.NONSHARED_BINARIES, False) Build.BuildContext.NONSHARED_BINARY = NONSHARED_BINARY |