diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-11-12 09:59:12 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | 2b03e91c15d580abe7d27dc8619558073a885db7 (patch) | |
| tree | 110d965e648a4b16fe71a02f769d65a415edad77 /mesonbuild/compilers | |
| parent | 5b2bdb4fcf7a685744876173c0ccabc014344b04 (diff) | |
| download | meson-2b03e91c15d580abe7d27dc8619558073a885db7.tar.gz | |
compilers: Remove Environment parameter from Compiler.get_soname_args
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 5 | ||||
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 5 | ||||
| -rw-r--r-- | mesonbuild/compilers/d.py | 6 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/islinker.py | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 8def474c9..f9de3e54a 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1075,11 +1075,10 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): def get_optimization_link_args(self, optimization_level: str) -> T.List[str]: return self.linker.get_optimization_link_args(optimization_level) - def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, - suffix: str, soversion: str, + def get_soname_args(self, prefix: str, shlib_name: str, suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]: return self.linker.get_soname_args( - env, prefix, shlib_name, suffix, soversion, + prefix, shlib_name, suffix, soversion, darwin_versions) def get_target_link_args(self, target: 'BuildTarget') -> T.List[str]: diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 606315e77..17ab054c9 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -678,11 +678,10 @@ class CudaCompiler(Compiler): args = self.get_ccbin_args(target, env, subproject) return args + self._to_host_flags(self.host_compiler.get_option_link_args(target, env, subproject), Phase.LINKER) - def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, - suffix: str, soversion: str, + def get_soname_args(self, prefix: str, shlib_name: str, suffix: str, soversion: 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), Phase.LINKER) + 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 1fa2cbd01..57426e086 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -376,11 +376,9 @@ class DmdLikeCompilerMixin(CompilerMixinBase): return [] return self.mscrt_args[self.get_crt_val(crt_val, buildtype)] - def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, - suffix: str, soversion: str, + def get_soname_args(self, prefix: str, shlib_name: str, suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]: - sargs = super().get_soname_args(env, prefix, shlib_name, suffix, - soversion, darwin_versions) + sargs = super().get_soname_args(prefix, shlib_name, suffix, 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 762b5682e..9832cc74c 100644 --- a/mesonbuild/compilers/mixins/islinker.py +++ b/mesonbuild/compilers/mixins/islinker.py @@ -96,7 +96,7 @@ class BasicLinkerIsCompilerMixin(Compiler): def bitcode_args(self) -> T.List[str]: raise MesonException("This linker doesn't support bitcode bundles") - def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, + def get_soname_args(self, prefix: str, shlib_name: str, suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]: raise MesonException("This linker doesn't support soname args") |
