diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-17 21:58:22 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-19 11:22:35 +1100 |
| commit | d48570143656d1c570c282f8e21e058508910f3c (patch) | |
| tree | 0bedcceedc12f361b91d33d2f407671b561af5be /buildtools/wafsamba/wafsamba.py | |
| parent | 7197bcc513e707676f10734cffd6f2f494a360c1 (diff) | |
| download | samba-d48570143656d1c570c282f8e21e058508910f3c.tar.gz samba-d48570143656d1c570c282f8e21e058508910f3c.tar.bz2 samba-d48570143656d1c570c282f8e21e058508910f3c.zip | |
waf: automap shared library names from .so to the right extension
this should help with MacOSX .dylib libraries
Diffstat (limited to 'buildtools/wafsamba/wafsamba.py')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 2f5d7869f3..02dc44a139 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -164,6 +164,9 @@ def SAMBA_LIBRARY(bld, libname, source, deps = TO_LIST(deps) deps.append(obj_target) + realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON')) + link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON')) + if target_type == 'PYTHON' or realname or not is_bundled: # Sanitize the library name bundled_name = libname.lower().replace('_', '-') @@ -363,7 +366,7 @@ def SAMBA_MODULE(bld, modname, source, while realname.startswith(subsystem+"_"): realname = realname[len(subsystem+"_"):] - realname = bld.env.shlib_PATTERN % realname + realname = bld.make_libname(realname) while realname.startswith("lib"): realname = realname[len("lib"):] |