summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mesonbuild/compilers/c.py2
-rw-r--r--mesonbuild/compilers/compilers.py8
-rw-r--r--mesonbuild/compilers/cpp.py2
-rw-r--r--mesonbuild/compilers/cuda.py8
-rw-r--r--mesonbuild/compilers/d.py4
-rw-r--r--mesonbuild/compilers/detect.py2
-rw-r--r--mesonbuild/compilers/fortran.py6
-rw-r--r--mesonbuild/compilers/mixins/clike.py20
-rw-r--r--mesonbuild/compilers/rust.py4
-rw-r--r--mesonbuild/compilers/vala.py4
-rw-r--r--mesonbuild/interpreter/compiler.py2
11 files changed, 31 insertions, 31 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index e6b1ca139..51db061ae 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -92,7 +92,7 @@ class CCompiler(CLikeCompiler, Compiler):
#endif
return 0;
}}'''
- return self.compiles(t.format(**fargs), env, extra_args=extra_args,
+ return self.compiles(t.format(**fargs), extra_args=extra_args,
dependencies=dependencies)
def get_options(self) -> 'MutableKeyedOptionDictType':
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 838b15d6d..5862e82a8 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1357,7 +1357,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
with self.cached_compile(code, env.coredata, extra_args=args, mode=mode, temp_dir=env.scratch_dir) as r:
yield r
- def compiles(self, code: 'mesonlib.FileOrString', env: 'Environment', *,
+ def compiles(self, code: 'mesonlib.FileOrString', *,
extra_args: T.Union[None, T.List[str], CompilerArgs, T.Callable[[CompileCheckMode], T.List[str]]] = None,
dependencies: T.Optional[T.List['Dependency']] = None,
mode: CompileCheckMode = CompileCheckMode.COMPILE,
@@ -1368,7 +1368,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
A tuple of (bool, bool). The first value is whether the check
succeeded, and the second is whether it was retrieved from a cache
"""
- with self._build_wrapper(code, env, extra_args, dependencies, mode, disable_cache=disable_cache) as p:
+ with self._build_wrapper(code, self.environment, extra_args, dependencies, mode, disable_cache=disable_cache) as p:
return p.returncode == 0, p.cached
def links(self, code: 'mesonlib.FileOrString', *,
@@ -1379,10 +1379,10 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
if compiler:
with compiler._build_wrapper(code, self.environment, dependencies=dependencies, want_output=True) as r:
objfile = mesonlib.File.from_absolute_file(r.output_name)
- return self.compiles(objfile, self.environment, extra_args=extra_args,
+ return self.compiles(objfile, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=True)
- return self.compiles(code, self.environment, extra_args=extra_args,
+ return self.compiles(code, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=disable_cache)
def get_feature_args(self, kwargs: DFeatures, build_to_src: str) -> T.List[str]:
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index b1830a1c2..f3301a963 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -111,7 +111,7 @@ class CPPCompiler(CLikeCompiler, Compiler):
#include <{hname}>
using {symbol};
int main(void) {{ return 0; }}'''
- return self.compiles(t, env, extra_args=extra_args,
+ return self.compiles(t, extra_args=extra_args,
dependencies=dependencies)
def _test_cpp_std_arg(self, cpp_std_value: str) -> bool:
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index 9d77968f3..4bf847c60 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -607,7 +607,7 @@ class CudaCompiler(Compiler):
#endif
return 0;
}}'''
- found, cached = self.compiles(t.format_map(fargs), env, extra_args=extra_args, dependencies=dependencies)
+ found, cached = self.compiles(t.format_map(fargs), extra_args=extra_args, dependencies=dependencies)
if found:
return True, cached
# Check if it's a class or a template
@@ -617,7 +617,7 @@ class CudaCompiler(Compiler):
int main(void) {{
return 0;
}}'''
- return self.compiles(t.format_map(fargs), env, extra_args=extra_args, dependencies=dependencies)
+ return self.compiles(t.format_map(fargs), extra_args=extra_args, dependencies=dependencies)
_CPP14_VERSION = '>=9.0'
_CPP17_VERSION = '>=11.0'
@@ -815,9 +815,9 @@ class CudaCompiler(Compiler):
def has_multi_arguments(self, args: T.List[str], env: Environment) -> T.Tuple[bool, bool]:
args = self._to_host_flags(args)
- return self.compiles('int main(void) { return 0; }', env, extra_args=args, mode=CompileCheckMode.COMPILE)
+ return self.compiles('int main(void) { return 0; }', extra_args=args, mode=CompileCheckMode.COMPILE)
def has_multi_link_arguments(self, args: T.List[str], env: Environment) -> T.Tuple[bool, bool]:
args = ['-Xnvlink='+self._shield_nvcc_list_arg(s) for s in self.linker.fatal_warnings()]
args += self._to_host_flags(args, phase=Phase.LINKER)
- return self.compiles('int main(void) { return 0; }', env, extra_args=args, mode=CompileCheckMode.LINK)
+ return self.compiles('int main(void) { return 0; }', extra_args=args, mode=CompileCheckMode.LINK)
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index ccafe291c..7d30bfb19 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -538,7 +538,7 @@ class DCompiler(Compiler):
return DCompilerArgs(self, args)
def has_multi_arguments(self, args: T.List[str], env: 'Environment') -> T.Tuple[bool, bool]:
- return self.compiles('int i;\n', env, extra_args=args)
+ return self.compiles('int i;\n', extra_args=args)
def _get_target_arch_args(self) -> T.List[str]:
# LDC2 on Windows targets to current OS architecture, but
@@ -628,7 +628,7 @@ class DCompiler(Compiler):
code = f'''{prefix}
import {hname};
'''
- return self.compiles(code, env, extra_args=extra_args,
+ return self.compiles(code, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.COMPILE, disable_cache=disable_cache)
class GnuDCompiler(GnuCompiler, DCompiler):
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
index 83f7fff4c..d005b6817 100644
--- a/mesonbuild/compilers/detect.py
+++ b/mesonbuild/compilers/detect.py
@@ -930,7 +930,7 @@ def _detect_objc_or_objcpp_compiler(env: 'Environment', lang: str, for_machine:
c = comp(
ccache, compiler, version, for_machine, env,
defines, linker=linker)
- if not c.compiles('int main(void) { return 0; }', env)[0]:
+ if not c.compiles('int main(void) { return 0; }')[0]:
popen_exceptions[join_args(compiler)] = f'GCC was not built with support for {"objective-c" if lang == "objc" else "objective-c++"}'
continue
return c
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 6ec8546a5..2a3521f35 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -133,7 +133,7 @@ class FortranCompiler(CLikeCompiler, Compiler):
{prefix}
real(merge(kind(1.),-1,({expression}))), parameter :: fail = 1.
end program test'''
- return self.compiles(t, env, extra_args=extra_args,
+ return self.compiles(t, extra_args=extra_args,
dependencies=dependencies)[0]
def cross_compute_int(self, expression: str, low: T.Optional[int], high: T.Optional[int],
@@ -218,7 +218,7 @@ class FortranCompiler(CLikeCompiler, Compiler):
{typename} :: something
end program test
'''
- if not self.compiles(t, env, extra_args=extra_args,
+ if not self.compiles(t, extra_args=extra_args,
dependencies=dependencies)[0]:
return -1
return self.cross_compute_int('c_sizeof(x)', None, None, None, prefix + '\nuse iso_c_binding\n' + typename + ' :: x', env, extra_args, dependencies)
@@ -319,7 +319,7 @@ class GnuFortranCompiler(GnuCompiler, FortranCompiler):
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, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.PREPROCESS, disable_cache=disable_cache)
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 1f073d615..8bbd4d423 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -318,7 +318,7 @@ class CLikeCompiler(Compiler):
dependencies: T.Optional[T.List['Dependency']] = None) -> T.Tuple[bool, bool]:
code = f'''{prefix}
#include <{hname}>'''
- return self.compiles(code, env, extra_args=extra_args,
+ return self.compiles(code, extra_args=extra_args,
dependencies=dependencies)
def has_header(self, hname: str, prefix: str, env: 'Environment', *,
@@ -333,7 +333,7 @@ class CLikeCompiler(Compiler):
#else
#include <{hname}>
#endif'''
- return self.compiles(code, env, extra_args=extra_args,
+ return self.compiles(code, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.PREPROCESS, disable_cache=disable_cache)
def has_header_symbol(self, hname: str, symbol: str, prefix: str,
@@ -349,7 +349,7 @@ class CLikeCompiler(Compiler):
#endif
return 0;
}}'''
- return self.compiles(t, env, extra_args=extra_args,
+ return self.compiles(t, extra_args=extra_args,
dependencies=dependencies)
def _get_basic_compiler_args(self, env: 'Environment', mode: CompileCheckMode) -> T.Tuple[T.List[str], T.List[str]]:
@@ -452,7 +452,7 @@ class CLikeCompiler(Compiler):
t = f'''{prefix}
#include <stddef.h>
int main(void) {{ static int a[1-2*!({expression})]; a[0]=0; return 0; }}'''
- return self.compiles(t, env, extra_args=extra_args,
+ return self.compiles(t, extra_args=extra_args,
dependencies=dependencies)[0]
def cross_compute_int(self, expression: str, low: T.Optional[int], high: T.Optional[int],
@@ -551,7 +551,7 @@ class CLikeCompiler(Compiler):
{typename} something;
return 0;
}}'''
- if not self.compiles(t, env, extra_args=extra_args,
+ if not self.compiles(t, extra_args=extra_args,
dependencies=dependencies)[0]:
return -1
return self.cross_compute_int(f'sizeof({typename})', None, None, None, prefix, env, extra_args, dependencies)
@@ -591,7 +591,7 @@ class CLikeCompiler(Compiler):
{typename} something;
return 0;
}}'''
- if not self.compiles(t, env, extra_args=extra_args,
+ if not self.compiles(t, extra_args=extra_args,
dependencies=dependencies)[0]:
return -1
t = f'''{prefix}
@@ -880,7 +880,7 @@ class CLikeCompiler(Compiler):
{members}
(void) foo;
}}'''
- return self.compiles(t, env, extra_args=extra_args,
+ return self.compiles(t, extra_args=extra_args,
dependencies=dependencies)
def has_type(self, typename: str, prefix: str, env: 'Environment',
@@ -890,7 +890,7 @@ class CLikeCompiler(Compiler):
void bar(void) {{
(void) sizeof({typename});
}}'''
- return self.compiles(t, env, extra_args=extra_args,
+ return self.compiles(t, extra_args=extra_args,
dependencies=dependencies)
def _symbols_have_underscore_prefix_searchbin(self, env: 'Environment') -> bool:
@@ -1293,7 +1293,7 @@ class CLikeCompiler(Compiler):
def has_arguments(self, args: T.List[str], env: 'Environment', code: str,
mode: CompileCheckMode) -> T.Tuple[bool, bool]:
- return self.compiles(code, env, extra_args=args, mode=mode)
+ return self.compiles(code, extra_args=args, mode=mode)
def _has_multi_arguments(self, args: T.List[str], env: 'Environment', code: str) -> T.Tuple[bool, bool]:
new_args: T.List[str] = []
@@ -1364,7 +1364,7 @@ class CLikeCompiler(Compiler):
if name in {'dllimport', 'dllexport'}:
return False, False
- return self.compiles(self.attribute_check_func(name), env,
+ return self.compiles(self.attribute_check_func(name),
extra_args=self.get_has_func_attribute_extra_args(name))
def get_assert_args(self, disable: bool, env: 'Environment') -> T.List[str]:
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
index 0faf2cf96..8133555c6 100644
--- a/mesonbuild/compilers/rust.py
+++ b/mesonbuild/compilers/rust.py
@@ -447,11 +447,11 @@ class RustCompiler(Compiler):
return exelist + args
def has_multi_arguments(self, args: T.List[str], env: Environment) -> T.Tuple[bool, bool]:
- return self.compiles('fn main() { std::process::exit(0) }\n', env, extra_args=args, mode=CompileCheckMode.COMPILE)
+ return self.compiles('fn main() { std::process::exit(0) }\n', extra_args=args, mode=CompileCheckMode.COMPILE)
def has_multi_link_arguments(self, args: T.List[str], env: Environment) -> T.Tuple[bool, bool]:
args = rustc_link_args(self.linker.fatal_warnings()) + args
- return self.compiles('fn main() { std::process::exit(0) }\n', env, extra_args=args, mode=CompileCheckMode.LINK)
+ return self.compiles('fn main() { std::process::exit(0) }\n', extra_args=args, mode=CompileCheckMode.LINK)
@functools.lru_cache(maxsize=None)
def get_rustdoc(self, env: 'Environment') -> T.Optional[RustdocTestCompiler]:
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
index ef1916334..ca16da4eb 100644
--- a/mesonbuild/compilers/vala.py
+++ b/mesonbuild/compilers/vala.py
@@ -204,11 +204,11 @@ class ValaCompiler(Compiler):
if compiler:
with compiler._build_wrapper(code, self.environment, dependencies=dependencies, want_output=True) as r:
objfile = mesonlib.File.from_absolute_file(r.output_name)
- result = self.compiles(objfile, self.environment, extra_args=extra_args,
+ result = self.compiles(objfile, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=True)
self.force_link = False
return result
- result = self.compiles(code, self.environment, extra_args=extra_args,
+ result = self.compiles(code, extra_args=extra_args,
dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=disable_cache)
self.force_link = False
return result
diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py
index 8fc4df9e6..30c7eff69 100644
--- a/mesonbuild/interpreter/compiler.py
+++ b/mesonbuild/interpreter/compiler.py
@@ -513,7 +513,7 @@ class CompilerHolder(ObjectHolder['Compiler']):
code.absolute_path(self.environment.source_dir, self.environment.build_dir))
extra_args = functools.partial(self._determine_args, kwargs)
deps, msg = self._determine_dependencies(kwargs['dependencies'], endl=None)
- result, cached = self.compiler.compiles(code, self.environment,
+ result, cached = self.compiler.compiles(code,
extra_args=extra_args,
dependencies=deps)
if required and not result:
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-04 12:01:23 +0000