summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-11-03 09:06:25 -0800
committerDylan Baker <dylan@pnwbakers.com>2025-11-19 10:48:48 -0800
commitcd4293b54a624026dcbc289b22fde9ef37b8c7eb (patch)
tree02617e2290736c8f15f7a9049339f4d4a113ef7e /mesonbuild/compilers
parent068cb9db2a07c665cb55f68a70f42bb2b773e720 (diff)
downloadmeson-cd4293b54a624026dcbc289b22fde9ef37b8c7eb.tar.gz
compilers: Remove Environment parameter from Compiler.get_return_value
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/compilers.py1
-rw-r--r--mesonbuild/compilers/mixins/clike.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 6ac9cc0f7..5486b5d7e 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1179,7 +1179,6 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
fname: str,
rtype: str,
prefix: str,
- env: 'Environment',
extra_args: T.Optional[T.List[str]],
dependencies: T.Optional[T.List['Dependency']]) -> T.Union[str, int]:
raise EnvironmentException(f'{self.id} does not support get_return_value')
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 495cb9b26..6967362b6 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -679,7 +679,7 @@ class CLikeCompiler(Compiler):
return define_value, cached
def get_return_value(self, fname: str, rtype: str, prefix: str,
- env: 'Environment', extra_args: T.Optional[T.List[str]],
+ extra_args: T.Optional[T.List[str]],
dependencies: T.Optional[T.List['Dependency']]) -> T.Union[str, int]:
# TODO: rtype should be an enum.
# TODO: maybe we can use overload to tell mypy when this will return int vs str?
@@ -697,7 +697,7 @@ class CLikeCompiler(Compiler):
printf ("{fmt}", {cast} {fname}());
return 0;
}}'''
- res = self.run(code, env, extra_args=extra_args, dependencies=dependencies)
+ res = self.run(code, self.environment, extra_args=extra_args, dependencies=dependencies)
if not res.compiled:
raise mesonlib.EnvironmentException(f'Could not get return value of {fname}()')
if rtype == 'string':