diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 14:12:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-21 14:12:19 +0300 |
| commit | 6ae40344e0ab6d6b64947af17faeebe8ac20724e (patch) | |
| tree | 93c6146b86657ea5989717752bfe0f155f4a92aa /mesonbuild/build.py | |
| parent | e3783f0f595cf00afeb41410b215d26eba228327 (diff) | |
| parent | 5f3097a4928056c009b8fb30a4c6725a93e1e858 (diff) | |
| download | meson-6ae40344e0ab6d6b64947af17faeebe8ac20724e.zip meson-6ae40344e0ab6d6b64947af17faeebe8ac20724e.tar.gz meson-6ae40344e0ab6d6b64947af17faeebe8ac20724e.tar.bz2 | |
Merge pull request #680 from centricular/osx-dylib-soversion
Add a test to find libfoo.X.dylib via -lfoo
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 94b95c2..dd03d81 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -825,12 +825,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' |