compilers: remove Environment parameter from has_header

and replace with self.env

mesonbuild/compilers/compilers.py

@@ -679,7 +679,7 @@ def check_header(self, hname: str, prefix: str, *,
         """
         raise EnvironmentException('Language %s does not support header checks.' % self.get_display_language())
 
-    def has_header(self, hname: str, prefix: str, env: 'Environment', *,
+    def has_header(self, hname: str, prefix: str, *,
                    extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]] = None,
                    dependencies: T.Optional[T.List['Dependency']] = None,
                    disable_cache: bool = False) -> T.Tuple[bool, bool]:

mesonbuild/compilers/d.py

@@ -776,7 +776,7 @@ def alignment(self, typename: str, prefix: str, env: 'Environment', *,
             raise mesonlib.EnvironmentException(f'Could not determine alignment of {typename}. Sorry. You might want to file a bug.')
         return align, res.cached
 
-    def has_header(self, hname: str, prefix: str, env: 'Environment', *,
+    def has_header(self, hname: str, prefix: str, *,
                    extra_args: T.Union[None, T.List[str], T.Callable[['CompileCheckMode'], T.List[str]]] = None,
                    dependencies: T.Optional[T.List['Dependency']] = None,
                    disable_cache: bool = False) -> T.Tuple[bool, bool]:
@@ -785,7 +785,7 @@ def has_header(self, hname: str, prefix: str, env: 'Environment', *,
         code = f'''{prefix}
         import {hname};
         '''
-        return self.compiles(code, env, extra_args=extra_args,
+        return self.compiles(code, self.env, extra_args=extra_args,
                              dependencies=dependencies, mode='compile', disable_cache=disable_cache)
 
 class GnuDCompiler(GnuCompiler, DCompiler):

mesonbuild/compilers/fortran.py

@@ -195,7 +195,7 @@ def language_stdlib_only_link_flags(self, env: 'Environment') -> T.List[str]:
             search_dirs.append(f'-L{d}')
         return search_dirs + ['-lgfortran', '-lm']
 
-    def has_header(self, hname: str, prefix: str, env: 'Environment', *,
+    def has_header(self, hname: str, prefix: str, *,
                    extra_args: T.Union[None, T.List[str], T.Callable[['CompileCheckMode'], T.List[str]]] = None,
                    dependencies: T.Optional[T.List['Dependency']] = None,
                    disable_cache: bool = False) -> T.Tuple[bool, bool]:
@@ -205,7 +205,7 @@ def has_header(self, hname: str, prefix: str, env: 'Environment', *,
         https://github.com/mesonbuild/meson/issues/7017
         '''
         code = f'{prefix}\n#include <{hname}>'
-        return self.compiles(code, env, extra_args=extra_args,
+        return self.compiles(code, self.env, extra_args=extra_args,
                              dependencies=dependencies, mode='preprocess', disable_cache=disable_cache)
 
 

mesonbuild/compilers/mixins/clike.py

@@ -357,7 +357,7 @@ def check_header(self, hname: str, prefix: str, *,
         return self.compiles(code, self.env, extra_args=extra_args,
                              dependencies=dependencies)
 
-    def has_header(self, hname: str, prefix: str, env: 'Environment', *,
+    def has_header(self, hname: str, prefix: str, *,
                    extra_args: T.Union[None, T.List[str], T.Callable[['CompileCheckMode'], T.List[str]]] = None,
                    dependencies: T.Optional[T.List['Dependency']] = None,
                    disable_cache: bool = False) -> T.Tuple[bool, bool]:
@@ -369,7 +369,7 @@ def has_header(self, hname: str, prefix: str, env: 'Environment', *,
         #else
          #include <{hname}>
         #endif'''
-        return self.compiles(code, env, extra_args=extra_args,
+        return self.compiles(code, self.env, extra_args=extra_args,
                              dependencies=dependencies, mode='preprocess', disable_cache=disable_cache)
 
     def has_header_symbol(self, hname: str, symbol: str, prefix: str, *,

mesonbuild/dependencies/dev.py

@@ -537,7 +537,7 @@ def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.
                 libs = ['z']
             for lib in libs:
                 l = self.clib_compiler.find_library(lib, environment, [])
-                h = self.clib_compiler.has_header('zlib.h', '', environment, dependencies=[self])
+                h = self.clib_compiler.has_header('zlib.h', '', dependencies=[self])
                 if l and h[0]:
                     self.is_found = True
                     self.link_args = l

mesonbuild/dependencies/misc.py

@@ -75,7 +75,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
         super().__init__(name, env, kwargs)
         self.feature_since = ('0.62.0', "consider checking for `dlopen` with and without `find_library('dl')`")
 
-        h = self.clib_compiler.has_header('dlfcn.h', '', env)
+        h = self.clib_compiler.has_header('dlfcn.h', '')
         self.link_args = self.clib_compiler.find_library('dl', env, [], self.libtype)
 
         if h[0] and self.link_args:
@@ -131,7 +131,7 @@ def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> No
             # Flang has omp_lib.h
             header_names = ('omp.h', 'omp_lib.h')
             for name in header_names:
-                if self.clib_compiler.has_header(name, '', self.env, dependencies=[self], disable_cache=True)[0]:
+                if self.clib_compiler.has_header(name, '', dependencies=[self], disable_cache=True)[0]:
                     self.is_found = True
                     self.compile_args = self.clib_compiler.openmp_flags()
                     self.link_args = self.clib_compiler.openmp_link_flags()
@@ -169,7 +169,7 @@ def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> No
             self.compile_args = ['-fblocks']
             self.link_args = ['-lBlocksRuntime']
 
-            if not self.clib_compiler.has_header('Block.h', '', environment, disable_cache=True) or \
+            if not self.clib_compiler.has_header('Block.h', '', disable_cache=True) or \
                not self.clib_compiler.find_library('BlocksRuntime', environment, []):
                 mlog.log(mlog.red('ERROR:'), 'BlocksRuntime not found.')
                 return
@@ -344,7 +344,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
             l = self.clib_compiler.find_library(lib, env, [])
             if l:
                 for header in headers:
-                    h = self.clib_compiler.has_header(header, '', env)
+                    h = self.clib_compiler.has_header(header, '')
                     if h[0]:
                         self.is_found = True
                         self.link_args = l
@@ -390,7 +390,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
         super().__init__(name, env, kwargs)
         self.feature_since = ('0.60.0', "consider checking for `iconv_open` with and without find_library('iconv')")
 
-        h = self.clib_compiler.has_header('iconv.h', '', env)
+        h = self.clib_compiler.has_header('iconv.h', '')
         self.link_args = self.clib_compiler.find_library('iconv', env, [], self.libtype)
 
         if h[0] and self.link_args:
@@ -412,7 +412,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
         super().__init__(name, env, kwargs)
         self.feature_since = ('0.59.0', "consider checking for `ngettext` with and without `find_library('intl')`")
 
-        h = self.clib_compiler.has_header('libintl.h', '', env)
+        h = self.clib_compiler.has_header('libintl.h', '')
         self.link_args = self.clib_compiler.find_library('intl', env, [], self.libtype)
 
         if h[0] and self.link_args:
@@ -432,7 +432,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
             'method': 'system',
             'static': self.static,
         }
-        if not self.clib_compiler.has_header('openssl/ssl.h', '', env)[0]:
+        if not self.clib_compiler.has_header('openssl/ssl.h', '')[0]:
             return
 
         # openssl >= 3 only

mesonbuild/dependencies/python.py

@@ -216,7 +216,7 @@ def __init__(self, name: str, environment: 'Environment',
         if mesonlib.is_windows() and self.get_windows_python_arch().endswith('64') and mesonlib.version_compare(self.version, '<3.12'):
             self.compile_args += ['-DMS_WIN64=']
 
-        if not self.clib_compiler.has_header('Python.h', '', environment, extra_args=self.compile_args):
+        if not self.clib_compiler.has_header('Python.h', '', extra_args=self.compile_args):
             self.is_found = False
 
     def find_libpy(self, environment: 'Environment') -> None:

mesonbuild/dependencies/ui.py

@@ -54,7 +54,7 @@ def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.
             return
         else:
             links = self.clib_compiler.find_library('GL', environment, [])
-            has_header = self.clib_compiler.has_header('GL/gl.h', '', environment)[0]
+            has_header = self.clib_compiler.has_header('GL/gl.h', '')[0]
             if links and has_header:
                 self.is_found = True
                 self.link_args = links
@@ -242,7 +242,7 @@ def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.
         else:
             # simply try to guess it, usually works on linux
             libs = self.clib_compiler.find_library('vulkan', environment, [])
-            if libs is not None and self.clib_compiler.has_header('vulkan/vulkan.h', '', environment, disable_cache=True)[0]:
+            if libs is not None and self.clib_compiler.has_header('vulkan/vulkan.h', '', disable_cache=True)[0]:
                 self.is_found = True
                 for lib in libs:
                     self.link_args.append(lib)

mesonbuild/interpreter/compiler.py

@@ -531,7 +531,7 @@ def _has_header_impl(self, hname: str, kwargs: 'HeaderKW') -> bool:
             return False
         extra_args = functools.partial(self._determine_args, kwargs['no_builtin_args'], kwargs['include_directories'], kwargs['args'])
         deps, msg = self._determine_dependencies(kwargs['dependencies'])
-        haz, cached = self.compiler.has_header(hname, kwargs['prefix'], self.environment,
+        haz, cached = self.compiler.has_header(hname, kwargs['prefix'],
                                                extra_args=extra_args, dependencies=deps)
         cached_msg = mlog.blue('(cached)') if cached else ''
         if required and not haz: