diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2017-07-21 23:33:35 +1000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 20:36:50 +0300 |
| commit | a9559e0d775c95693a3dd7c1de7aaf2b4113d94a (patch) | |
| tree | cd0c713079ccf4dedc307fac127076fb31597f57 | |
| parent | b32af18e75d38f63aff77e3a2347cb15d322d377 (diff) | |
| download | meson-a9559e0d775c95693a3dd7c1de7aaf2b4113d94a.zip meson-a9559e0d775c95693a3dd7c1de7aaf2b4113d94a.tar.gz meson-a9559e0d775c95693a3dd7c1de7aaf2b4113d94a.tar.bz2 | |
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.
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 |
1 files changed, 0 insertions, 2 deletions
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): |