diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-18 15:02:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 15:02:39 +0300 |
| commit | 6614c7352645770d68bc1adb782fef4da323815a (patch) | |
| tree | 1e2c0e6da45268d72a272221a0eb76801d9df2aa /mesonbuild/compilers | |
| parent | 116e4d4850a61a740d2a8642866452740e359750 (diff) | |
| parent | 3efed376c376b6275024c5600b30a6c5e12edf97 (diff) | |
| download | meson-6614c7352645770d68bc1adb782fef4da323815a.zip meson-6614c7352645770d68bc1adb782fef4da323815a.tar.gz meson-6614c7352645770d68bc1adb782fef4da323815a.tar.bz2 | |
Merge pull request #8996 from bonzini/fix8746
Do not add SONAME to shared modules
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 5 | ||||
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 6 | ||||
| -rw-r--r-- | mesonbuild/compilers/d.py | 5 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/islinker.py | 3 |
4 files changed, 7 insertions, 12 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 52529f7..fc01ac0 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -988,11 +988,10 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, suffix: str, soversion: str, - darwin_versions: T.Tuple[str, str], - is_shared_module: bool) -> T.List[str]: + darwin_versions: T.Tuple[str, str]) -> T.List[str]: return self.linker.get_soname_args( env, prefix, shlib_name, suffix, soversion, - darwin_versions, is_shared_module) + darwin_versions) def get_target_link_args(self, target: 'BuildTarget') -> T.List[str]: return target.link_args diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 4c0d0a6..4a14ae9 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -650,11 +650,9 @@ class CudaCompiler(Compiler): def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, suffix: str, soversion: str, - darwin_versions: T.Tuple[str, str], - is_shared_module: bool) -> T.List[str]: + darwin_versions: T.Tuple[str, str]) -> T.List[str]: return self._to_host_flags(self.host_compiler.get_soname_args( - env, prefix, shlib_name, suffix, soversion, darwin_versions, - is_shared_module), _Phase.LINKER) + env, prefix, shlib_name, suffix, soversion, darwin_versions), _Phase.LINKER) def get_compile_only_args(self) -> T.List[str]: return ['-c'] diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index b5ec905..eb1cf74 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -468,10 +468,9 @@ class DmdLikeCompilerMixin(CompilerMixinBase): def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, suffix: str, soversion: str, - darwin_versions: T.Tuple[str, str], - is_shared_module: bool) -> T.List[str]: + darwin_versions: T.Tuple[str, str]) -> T.List[str]: sargs = super().get_soname_args(env, prefix, shlib_name, suffix, - soversion, darwin_versions, is_shared_module) + soversion, darwin_versions) # LDC and DMD actually do use a linker, but they proxy all of that with # their own arguments diff --git a/mesonbuild/compilers/mixins/islinker.py b/mesonbuild/compilers/mixins/islinker.py index 4c29f8c..144bc70 100644 --- a/mesonbuild/compilers/mixins/islinker.py +++ b/mesonbuild/compilers/mixins/islinker.py @@ -104,8 +104,7 @@ class BasicLinkerIsCompilerMixin(Compiler): def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, suffix: str, soversion: str, - darwin_versions: T.Tuple[str, str], - is_shared_module: bool) -> T.List[str]: + darwin_versions: T.Tuple[str, str]) -> T.List[str]: raise MesonException("This linker doesn't support soname args") def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str, |