From cd4293b54a624026dcbc289b22fde9ef37b8c7eb Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Mon, 3 Nov 2025 09:06:25 -0800
Subject: compilers: Remove Environment parameter from
 Compiler.get_return_value

---
 mesonbuild/compilers/compilers.py    | 1 -
 mesonbuild/compilers/mixins/clike.py | 4 ++--
 mesonbuild/dependencies/misc.py      | 2 +-
 3 files changed, 3 insertions(+), 4 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':
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 3e0bb305b..74326827c 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -242,7 +242,7 @@ class PcapDependencyConfigTool(ConfigToolDependency):
             return None
 
         v = self.clib_compiler.get_return_value('pcap_lib_version', 'string',
-                                                '#include <pcap.h>', self.env, [], [self])
+                                                '#include <pcap.h>', [], [self])
         v = re.sub(r'libpcap version ', '', str(v))
         v = re.sub(r' -- Apple version.*$', '', v)
         return v
-- 
cgit v1.2.3