summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-11-13 09:54:10 -0800
committerDylan Baker <dylan@pnwbakers.com>2025-11-19 10:48:48 -0800
commiteb8ae929d97a060dac28b4a339e7c1df8d3118c8 (patch)
treefbdd583223488584e3ac2956f68b5e119b858d93 /mesonbuild/compilers
parent2768f41817732b1f6484bc6fec3dfdaf70dcc485 (diff)
downloadmeson-eb8ae929d97a060dac28b4a339e7c1df8d3118c8.tar.gz
compilers: Remove Environment parameter from Compiler.get_define
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/compilers.py2
-rw-r--r--mesonbuild/compilers/mixins/clike.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 4e807b0db..cdb928822 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -547,7 +547,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
def get_default_suffix(self) -> str:
return self.default_suffix
- def get_define(self, dname: str, prefix: str, env: 'Environment',
+ def get_define(self, dname: str, prefix: str,
extra_args: T.Union[T.List[str], T.Callable[[CompileCheckMode], T.List[str]]],
dependencies: T.List['Dependency'],
disable_cache: bool = False) -> T.Tuple[str, bool]:
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 28aef29d2..d186d885d 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -461,7 +461,7 @@ class CLikeCompiler(Compiler):
# Try to expand the expression and evaluate it on the build machines compiler
if self.language in self.environment.coredata.compilers.build:
try:
- expanded, _ = self.get_define(expression, prefix, self.environment, extra_args, dependencies, False)
+ expanded, _ = self.get_define(expression, prefix, extra_args, dependencies, False)
evaluate_expanded = f'''
#include <stdio.h>
#include <stdint.h>
@@ -635,7 +635,7 @@ class CLikeCompiler(Compiler):
return align, res.cached
- def get_define(self, dname: str, prefix: str, env: 'Environment',
+ def get_define(self, dname: str, prefix: str,
extra_args: T.Union[T.List[str], T.Callable[[CompileCheckMode], T.List[str]]],
dependencies: T.Optional[T.List['Dependency']],
disable_cache: bool = False) -> T.Tuple[str, bool]:
@@ -650,7 +650,7 @@ class CLikeCompiler(Compiler):
{delim_start}{dname}{delim_end}'''
args = self.build_wrapper_args(extra_args, dependencies,
mode=CompileCheckMode.PREPROCESS).to_native()
- func = functools.partial(self.cached_compile, code, env.coredata, extra_args=args, mode=CompileCheckMode.PREPROCESS)
+ func = functools.partial(self.cached_compile, code, self.environment.coredata, extra_args=args, mode=CompileCheckMode.PREPROCESS)
if disable_cache:
func = functools.partial(self.compile, code, extra_args=args, mode=CompileCheckMode.PREPROCESS)
with func() as p: