aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-08-16 15:53:55 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-08-16 16:14:10 +0530
commit5f3097a4928056c009b8fb30a4c6725a93e1e858 (patch)
treef469334164d9690360c760b64644f432db5d5fb5
parent2549ed8290bd1f754964cc2e1c706d431ad4259a (diff)
downloadmeson-5f3097a4928056c009b8fb30a4c6725a93e1e858.zip
meson-5f3097a4928056c009b8fb30a4c6725a93e1e858.tar.gz
meson-5f3097a4928056c009b8fb30a4c6725a93e1e858.tar.bz2
Don't add the soversion to the dylib filename on OS X
Doing so messes up library search with -lfoo. See: https://github.com/mesonbuild/meson/pull/680
-rw-r--r--mesonbuild/build.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 6a4f375..6025d9d 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -814,12 +814,10 @@ class SharedLibrary(BuildTarget):
elif for_darwin(is_cross, env):
prefix = 'lib'
suffix = 'dylib'
- if self.soversion:
- # libfoo.X.dylib
- self.filename_tpl = '{0.prefix}{0.name}.{0.soversion}.{0.suffix}'
- else:
- # libfoo.dylib
- self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
+ # libfoo.dylib
+ self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
+ # On OS X, the filename should never have the soversion
+ # See: https://github.com/mesonbuild/meson/pull/680
else:
prefix = 'lib'
suffix = 'so'