From 13b4e6e8c7616e37e4b1d37b49b82921c8c6059d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 17 Dec 2010 19:16:33 +0100 Subject: wafsamba: Move version script handling out of SAMBA_LIBRARY. --- buildtools/wafsamba/wafsamba.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'buildtools/wafsamba/wafsamba.py') diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 40dae9bd0aa..33ed018d4a5 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -212,13 +212,14 @@ def SAMBA_LIBRARY(bld, libname, source, 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)) fullname = bld.env.shlib_PATTERN % bundled_name bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript)) if Options.is_install: # also make the .inst file depend on the vscript instname = bld.env.shlib_PATTERN % (bundled_name + '.inst') bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript)) + else: + vscript = None bld.SET_BUILD_GROUP(group) t = bld( @@ -229,6 +230,7 @@ def SAMBA_LIBRARY(bld, libname, source, samba_ldflags = ldflags, samba_deps = deps, samba_includes = includes, + version_script = vscript, local_include = local_include, vnum = vnum, soname = soname, -- cgit