aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-02 22:26:50 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-02 22:28:18 +0200
commit04a2e6ded33057adb7f93ef8f75df5d081411e3f (patch)
treeb5fe4281b167c8b838138992c53b8d5322fa764c /mesonbuild/backend/ninjabackend.py
parent6d84b9b6468eca57763895efe51347047ca3088d (diff)
downloadmeson-04a2e6ded33057adb7f93ef8f75df5d081411e3f.zip
meson-04a2e6ded33057adb7f93ef8f75df5d081411e3f.tar.gz
meson-04a2e6ded33057adb7f93ef8f75df5d081411e3f.tar.bz2
Do not use -install_name or -shared when building modules on OSX,
but do use -bundle. Closes #1112.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 6e2b1ee..e5c430e 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1937,13 +1937,17 @@ rule FORTRAN_DEP_HACK
if isinstance(target, build.Executable):
commands += linker.get_std_exe_link_args()
elif isinstance(target, build.SharedLibrary):
- commands += linker.get_std_shared_lib_link_args()
+ if isinstance(target, build.SharedModule):
+ commands += linker.get_std_shared_module_link_args()
+ else:
+ commands += linker.get_std_shared_lib_link_args()
commands += linker.get_pic_args()
if hasattr(target, 'soversion'):
soversion = target.soversion
else:
soversion = None
- commands += linker.get_soname_args(target.prefix, target.name, target.suffix, abspath, soversion)
+ commands += linker.get_soname_args(target.prefix, target.name, target.suffix,
+ abspath, soversion, isinstance(target, build.SharedModule))
# This is only visited when using the Visual Studio toolchain
if target.vs_module_defs and hasattr(linker, 'gen_vs_module_defs_args'):
commands += linker.gen_vs_module_defs_args(target.vs_module_defs.rel_to_builddir(self.build_to_src))