diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-11-13 09:19:03 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | 78ec3e21eeebedf6070bb89b05d90735b6d2a242 (patch) | |
| tree | f04ad56bdf6ffb353aafd6ef9b66916c293dea4a /mesonbuild/compilers | |
| parent | 3dff12ab62ac453202ea107922a0a249b24c0925 (diff) | |
| download | meson-78ec3e21eeebedf6070bb89b05d90735b6d2a242.tar.gz | |
compilers: Remove Environment parameter from Compiler.cached_run
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 6 | ||||
| -rw-r--r-- | mesonbuild/compilers/d.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 5f9dc7b0d..cd8716540 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -712,10 +712,10 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): # For now we just accept code as a string, as that's what internal callers # need anyway. If we wanted to accept files, the cache key would need to # include mtime. - def cached_run(self, code: str, env: 'Environment', *, + def cached_run(self, code: str, *, extra_args: T.Union[T.List[str], T.Callable[[CompileCheckMode], T.List[str]], None] = None, dependencies: T.Optional[T.List['Dependency']] = None) -> RunResult: - run_check_cache = env.coredata.run_check_cache + run_check_cache = self.environment.coredata.run_check_cache args = self.build_wrapper_args(extra_args, dependencies, CompileCheckMode('link')) key = (code, tuple(args)) if key in run_check_cache: @@ -728,7 +728,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): mlog.debug('Cached run stdout:\n', p.stdout) mlog.debug('Cached run stderr:\n', p.stderr) else: - p = self.run(code, env, extra_args=extra_args, dependencies=dependencies) + p = self.run(code, self.environment, extra_args=extra_args, dependencies=dependencies) run_check_cache[key] = p return p diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index 9de8e0018..ce1784f53 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -587,7 +587,7 @@ class DCompiler(Compiler): writeln(({typename}).sizeof); }} ''' - res = self.cached_run(t, self.environment, extra_args=extra_args, + res = self.cached_run(t, extra_args=extra_args, dependencies=dependencies) if not res.compiled: return -1, False diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index ff7b79027..81320816e 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -239,7 +239,7 @@ class FortranCompiler(CLikeCompiler, Compiler): print '(i0)', c_sizeof(x) end program test ''' - res = self.cached_run(t, self.environment, extra_args=extra_args, + res = self.cached_run(t, extra_args=extra_args, dependencies=dependencies) if not res.compiled: return -1, False diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index ef7b351e4..9ff07a413 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -569,7 +569,7 @@ class CLikeCompiler(Compiler): printf("%ld\\n", (long)(sizeof({typename}))); return 0; }}''' - res = self.cached_run(t, self.environment, extra_args=extra_args, + res = self.cached_run(t, extra_args=extra_args, dependencies=dependencies) if not res.compiled: return -1, False @@ -619,7 +619,7 @@ class CLikeCompiler(Compiler): printf("%d", (int)offsetof(struct tmp, target)); return 0; }}''' - res = self.cached_run(t, self.environment, extra_args=extra_args, + res = self.cached_run(t, extra_args=extra_args, dependencies=dependencies) if not res.compiled: raise mesonlib.EnvironmentException('Could not compile alignment test.') |