summaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/dev.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-08-02 17:51:14 -0700
committerDylan Baker <dylan@pnwbakers.com>2025-10-20 15:15:53 -0700
commita85514edffaf1bb23fa6b04e98d957f31d42c946 (patch)
tree5c9f3d1ddfad2568d298b1c3a7f3731d3e9761a4 /mesonbuild/dependencies/dev.py
parent820c7e36b1aa2390fe83a2c4b48b7e8647597c45 (diff)
downloadmeson-a85514edffaf1bb23fa6b04e98d957f31d42c946.tar.gz
interpreter: port dependency native to typed_kwargs
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
-rw-r--r--mesonbuild/dependencies/dev.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index bc692ef42..4dcd5eb70 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -197,7 +197,7 @@ class LLVMDependencyConfigTool(ConfigToolDependency):
# of bits in the isa that llvm targets, for example, on x86_64
# and aarch64 the name will be llvm-config-64, on x86 and arm
# it will be llvm-config-32.
- if environment.machines[self.get_for_machine_from_kwargs(kwargs)].is_64_bit:
+ if environment.machines[kwargs.get('native', mesonlib.MachineChoice.HOST)].is_64_bit:
self.tools.append('llvm-config-64')
else:
self.tools.append('llvm-config-32')
@@ -389,11 +389,8 @@ class LLVMDependencyCMake(CMakeDependency):
self.llvm_modules = kwargs.get('modules', [])
self.llvm_opt_modules = stringlistify(extract_as_list(kwargs, 'optional_modules')) # type: ignore[arg-type]
- compilers = None
- if kwargs.get('native', False):
- compilers = env.coredata.compilers.build
- else:
- compilers = env.coredata.compilers.host
+ for_machine = kwargs.get('native', mesonlib.MachineChoice.HOST)
+ compilers = env.coredata.compilers[for_machine]
if not compilers or not {'c', 'cpp'}.issubset(compilers):
# Initialize basic variables
ExternalDependency.__init__(self, DependencyTypeName('cmake'), env, kwargs)