From f3d36b13acec43cfde318f9dcfa6c88e8ef9230c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 9 Dec 2010 12:30:30 +1100 Subject: waf: don't use symbol versioning on our modules Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/wafsamba.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'buildtools') 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( -- cgit