summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-12-09 12:30:30 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-09 13:18:08 +1100
commitf3d36b13acec43cfde318f9dcfa6c88e8ef9230c (patch)
treecea325ee2a96c9e136dbe6e1e051b889366271f6 /buildtools/wafsamba
parentc90b7824a618f878486d8d79a9b06887f05d6873 (diff)
downloadsamba-f3d36b13acec43cfde318f9dcfa6c88e8ef9230c.tar.gz
samba-f3d36b13acec43cfde318f9dcfa6c88e8ef9230c.tar.bz2
samba-f3d36b13acec43cfde318f9dcfa6c88e8ef9230c.zip
waf: don't use symbol versioning on our modules
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/wafsamba.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index f37f10da16..ef5aaba771 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -211,10 +211,13 @@ def SAMBA_LIBRARY(bld, libname, source,
vscript = "%s.vscript" % libname
if private_library:
version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
- else:
+ elif vnum:
version = "%s_%s" % (libname, vnum)
- bld.ABI_VSCRIPT(libname, abi_directory, version, vscript)
- ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
+ else:
+ version = None
+ if version:
+ bld.ABI_VSCRIPT(libname, abi_directory, version, vscript)
+ ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
bld.SET_BUILD_GROUP(group)
t = bld(