diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-10-24 14:55:15 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-12-17 14:47:18 -0800 |
| commit | e1164f616db78050b935e85fbc2cdb9f731e1511 (patch) | |
| tree | 0bd79c4ebc99816a6301de091f770047f04e369b /mesonbuild/dependencies/dev.py | |
| parent | 7ddd0732c27d97fbf36a96c8c3d6bd81cc28ad0f (diff) | |
| download | meson-e1164f616db78050b935e85fbc2cdb9f731e1511.tar.gz | |
dependencies: Require 'native' be passed in kwargs
This simplifies a bunch of cases, and likely fixes some annoying bugs
in cross compile situations where should have been passing this and
weren't.
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index dd21b910f..6e24251cd 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -198,7 +198,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[kwargs.get('native', mesonlib.MachineChoice.HOST)].is_64_bit: + if environment.machines[kwargs['native']].is_64_bit: self.tools.append('llvm-config-64') else: self.tools.append('llvm-config-32') @@ -391,7 +391,7 @@ class LLVMDependencyCMake(CMakeDependency): self.llvm_modules = kwargs.get('modules', []) self.llvm_opt_modules = kwargs.get('optional_modules', []) - for_machine = kwargs.get('native', mesonlib.MachineChoice.HOST) + for_machine = kwargs['native'] compilers = env.coredata.compilers[for_machine] if not compilers or not {'c', 'cpp'}.issubset(compilers): # Initialize basic variables |