diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-10-31 11:04:52 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | 0505da775e992485eb689827df8d5d76adf02c75 (patch) | |
| tree | 0a782d67b0cf484d5e4b2712ecfb2b57e0b90ba7 /mesonbuild/compilers/compilers.py | |
| parent | e6a8aea750a0eafe26e5470fa5c33eb1e61b768b (diff) | |
| download | meson-0505da775e992485eb689827df8d5d76adf02c75.tar.gz | |
Compilers: remove Environment parameter from Compiler.links()
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index b5680ed56..838b15d6d 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1371,18 +1371,18 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): with self._build_wrapper(code, env, extra_args, dependencies, mode, disable_cache=disable_cache) as p: return p.returncode == 0, p.cached - def links(self, code: 'mesonlib.FileOrString', env: 'Environment', *, + def links(self, code: 'mesonlib.FileOrString', *, compiler: T.Optional['Compiler'] = None, extra_args: T.Union[None, T.List[str], CompilerArgs, T.Callable[[CompileCheckMode], T.List[str]]] = None, dependencies: T.Optional[T.List['Dependency']] = None, disable_cache: bool = False) -> T.Tuple[bool, bool]: if compiler: - with compiler._build_wrapper(code, env, dependencies=dependencies, want_output=True) as r: + with compiler._build_wrapper(code, self.environment, dependencies=dependencies, want_output=True) as r: objfile = mesonlib.File.from_absolute_file(r.output_name) - return self.compiles(objfile, env, extra_args=extra_args, + return self.compiles(objfile, self.environment, extra_args=extra_args, dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=True) - return self.compiles(code, env, extra_args=extra_args, + return self.compiles(code, self.environment, extra_args=extra_args, dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=disable_cache) def get_feature_args(self, kwargs: DFeatures, build_to_src: str) -> T.List[str]: |
