summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/compilers.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-11-12 10:34:05 -0800
committerDylan Baker <dylan@pnwbakers.com>2025-11-19 10:48:48 -0800
commit6e081df405cfba85130ccd239f10ad769db8a34a (patch)
tree686c27376b44bb293432343effb06d9d1127f347 /mesonbuild/compilers/compilers.py
parentca15ed8f73e6b8c0cad81bee119c5c099e066767 (diff)
downloadmeson-6e081df405cfba85130ccd239f10ad769db8a34a.tar.gz
compilers: Remove Environment parameter from Compiler.has_multi_arguments
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
-rw-r--r--mesonbuild/compilers/compilers.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 007f44fcd..e1086eb73 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -299,7 +299,7 @@ def get_base_compile_args(target: 'BuildTarget', compiler: 'Compiler', env: 'Env
# We consider that if there are no sanitizer arguments returned, then
# the language doesn't support them.
if sanitize_args:
- if not compiler.has_multi_arguments(sanitize_args, env)[0]:
+ if not compiler.has_multi_arguments(sanitize_args)[0]:
raise MesonException(f'Compiler {compiler.name_string()} does not support sanitizer arguments {sanitize_args}')
args.extend(sanitize_args)
except KeyError:
@@ -373,7 +373,7 @@ def get_base_link_args(target: 'BuildTarget',
# We consider that if there are no sanitizer arguments returned, then
# the language doesn't support them.
if sanitizer_args:
- if not linker.has_multi_link_arguments(sanitizer_args, env)[0]:
+ if not linker.has_multi_link_arguments(sanitizer_args)[0]:
raise MesonException(f'Linker {linker.name_string()} does not support sanitizer arguments {sanitizer_args}')
args.extend(sanitizer_args)
except KeyError:
@@ -779,7 +779,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
def get_program_dirs(self, env: 'Environment') -> T.List[str]:
return []
- def has_multi_arguments(self, args: T.List[str], env: 'Environment') -> T.Tuple[bool, bool]:
+ def has_multi_arguments(self, args: T.List[str]) -> T.Tuple[bool, bool]:
"""Checks if the compiler has all of the arguments.
:returns:
@@ -790,14 +790,14 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
'Language {} does not support has_multi_arguments.'.format(
self.get_display_language()))
- def has_multi_link_arguments(self, args: T.List[str], env: 'Environment') -> T.Tuple[bool, bool]:
+ def has_multi_link_arguments(self, args: T.List[str]) -> T.Tuple[bool, bool]:
"""Checks if the linker has all of the arguments.
:returns:
A tuple of (bool, bool). The first value is whether the check
succeeded, and the second is whether it was retrieved from a cache
"""
- return self.linker.has_multi_arguments(args, env)
+ return self.linker.has_multi_arguments(args)
def _get_compile_output(self, dirname: str, mode: CompileCheckMode) -> str:
assert mode != CompileCheckMode.PREPROCESS, 'In pre-processor mode, the output is sent to stdout and discarded'