summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-17 19:21:58 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-17 19:21:58 +0100
commit402d622c0c4f501ab7085848cec135a8ff4d8a4c (patch)
treea507080077107f62dee2995a4d363f89d25c96a2
parent48f91ebc5aa3147b6b0784f676459dbe7e274a2b (diff)
downloadsamba-402d622c0c4f501ab7085848cec135a8ff4d8a4c.tar.gz
samba-402d622c0c4f501ab7085848cec135a8ff4d8a4c.tar.bz2
samba-402d622c0c4f501ab7085848cec135a8ff4d8a4c.zip
heimdal_build: Simplify version_script handling.
-rw-r--r--source4/heimdal_build/wscript_build13
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 77165e61a8..f8afe96f1e 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -202,7 +202,8 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
name=name)
-def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags=''):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
+ version_script=None):
'''define a Heimdal library'''
obj_target = libname + '.objlist'
@@ -236,14 +237,13 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags=''):
version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
if bld.env.HAVE_LD_VERSION_SCRIPT:
- vscript = "%s.vscript" % libname
+ version_script = "%s.vscript" % libname
namespace = version.replace("-","_").replace("+","_").upper(),
- HEIMDAL_GENERATOR(vscript,
+ HEIMDAL_GENERATOR(version_script,
rule="echo %s \{ global: \*\; \}\; > ${TGT}" % namespace,
group='vscripts',
- target=vscript)
- ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
- deps.append(vscript)
+ target=version_script)
+ deps.append(version_script)
features = 'cc cshlib symlink_lib install_lib'
@@ -260,6 +260,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags=''):
ldflags = ldflags,
vars = [version],
private_library = bundled_build,
+ version_script = version_script,
)