diff options
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 5 | ||||
| -rw-r--r-- | mesonbuild/interpreter/compiler.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 7f7a41ee7..732203c61 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -641,7 +641,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): def get_option_link_args(self, target: 'BuildTarget', env: 'Environment', subproject: T.Optional[str] = None) -> T.List[str]: return self.linker.get_option_link_args(target, env, subproject) - def check_header(self, hname: str, prefix: str, env: 'Environment', *, + def check_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) -> T.Tuple[bool, bool]: """Check that header is usable. diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 67a3b3863..7e46d6542 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -310,13 +310,12 @@ class CLikeCompiler(Compiler): code = 'int main(void) { int class=0; return class; }\n' return self._sanity_check_impl(work_dir, 'sanitycheckc.c', code) - def check_header(self, hname: str, prefix: str, env: 'Environment', *, + def check_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) -> T.Tuple[bool, bool]: code = f'''{prefix} #include <{hname}>''' - return self.compiles(code, extra_args=extra_args, - dependencies=dependencies) + return self.compiles(code, extra_args=extra_args, dependencies=dependencies) def has_header(self, hname: str, prefix: str, *, extra_args: T.Union[None, T.List[str], T.Callable[['CompileCheckMode'], T.List[str]]] = None, diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py index 92281d0a7..beff6eb4c 100644 --- a/mesonbuild/interpreter/compiler.py +++ b/mesonbuild/interpreter/compiler.py @@ -590,7 +590,7 @@ class CompilerHolder(ObjectHolder['Compiler']): return False extra_args = functools.partial(self._determine_args, kwargs) deps, msg = self._determine_dependencies(kwargs['dependencies']) - haz, cached = self.compiler.check_header(hname, kwargs['prefix'], self.environment, + haz, cached = self.compiler.check_header(hname, kwargs['prefix'], extra_args=extra_args, dependencies=deps) cached_msg = mlog.blue('(cached)') if cached else '' |