diff options
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/d.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 01098086b..7f7a41ee7 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -652,7 +652,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): """ 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]: diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 27461449d..46c7bf5d8 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -183,7 +183,7 @@ class _StdCPPLibMixin(CompilerMixinBase): def language_stdlib_provider(self, env: Environment) -> str: # https://stackoverflow.com/a/31658120 - header = 'version' if self.has_header('version', '', env)[0] else 'ciso646' + header = 'version' if self.has_header('version', '')[0] else 'ciso646' is_libcxx = self.has_header_symbol(header, '_LIBCPP_VERSION', '')[0] lib = 'c++' if is_libcxx else 'stdc++' return lib diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index b32b43355..dd120947d 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -617,7 +617,7 @@ class DCompiler(Compiler): 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]: diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index e22f97f0e..44a05b971 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -308,7 +308,7 @@ class GnuFortranCompiler(GnuCompiler, FortranCompiler): 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]: diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 5f37ce84f..67a3b3863 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -318,7 +318,7 @@ class CLikeCompiler(Compiler): return self.compiles(code, 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]: |