summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/samba_abi.py2
-rw-r--r--buildtools/wafsamba/wafsamba.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index d5376ca1e7..a4c9f68ccd 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -201,5 +201,5 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript):
target=vscript)
t.env.VERSION = version
t.env.LIBNAME = libname
- t.vars = [libname, version, vscript]
+ t.vars = ['LIBNAME', 'VERSION']
Build.BuildContext.ABI_VSCRIPT = ABI_VSCRIPT
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index ef5aaba771..fa910886a3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -218,6 +218,8 @@ def SAMBA_LIBRARY(bld, libname, source,
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))
bld.SET_BUILD_GROUP(group)
t = bld(