From a9559e0d775c95693a3dd7c1de7aaf2b4113d94a Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Fri, 21 Jul 2017 23:33:35 +1000 Subject: Fix linking Objective-C shared libs on OSX. This commit amends 04a2e6de making linker.get_std_shared_lib_link_args() always return -shared for SharedLibrary(es) instead of -bundle. SharedModule(s) get linked with linker.get_std_shared_module_link_args() which already correctly returns -bundle. Before this change -bundle and -install_name ended up being emitted for Objective-C shared libraries, which caused a linking error. --- mesonbuild/compilers/compilers.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'mesonbuild/compilers') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 0be3908..252db72 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -954,8 +954,6 @@ class GnuCompiler: return get_gcc_soname_args(self.gcc_type, prefix, shlib_name, suffix, path, soversion, is_shared_module) def get_std_shared_lib_link_args(self): - if self.gcc_type == GCC_OSX: - return ['-bundle'] return ['-shared'] def get_link_whole_for(self, args): -- cgit v1.1