diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-08-02 17:51:14 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-20 15:15:53 -0700 |
| commit | a85514edffaf1bb23fa6b04e98d957f31d42c946 (patch) | |
| tree | 5c9f3d1ddfad2568d298b1c3a7f3731d3e9761a4 /mesonbuild/interpreter/dependencyfallbacks.py | |
| parent | 820c7e36b1aa2390fe83a2c4b48b7e8647597c45 (diff) | |
| download | meson-a85514edffaf1bb23fa6b04e98d957f31d42c946.tar.gz | |
interpreter: port dependency native to typed_kwargs
Diffstat (limited to 'mesonbuild/interpreter/dependencyfallbacks.py')
| -rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index f980ef111..c9b762b0c 100644 --- a/mesonbuild/interpreter/dependencyfallbacks.py +++ b/mesonbuild/interpreter/dependencyfallbacks.py @@ -19,6 +19,7 @@ import typing as T if T.TYPE_CHECKING: from .interpreter import Interpreter from ..interpreterbase import TYPE_nkwargs, TYPE_nvar + from ..mesonlib import MachineChoice from .interpreterobjects import SubprojectHolder @@ -94,7 +95,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject): self._handle_featurenew_dependencies(name) dep = dependencies.find_external_dependency(name, self.environment, kwargs) if dep.found(): - for_machine = self.interpreter.machine_from_native_kwarg(kwargs) + for_machine = T.cast('MachineChoice', kwargs['native']) identifier = dependencies.get_dep_identifier(name, kwargs) self.coredata.deps[for_machine].put(identifier, dep) return dep @@ -209,7 +210,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject): # of None in the case the dependency is cached as not-found, or if cached # version does not match. In that case we don't want to continue with # other candidates. - for_machine = self.interpreter.machine_from_native_kwarg(kwargs) + for_machine = T.cast('MachineChoice', kwargs['native']) identifier = dependencies.get_dep_identifier(name, kwargs) wanted_vers = stringlistify(kwargs.get('version', [])) @@ -361,7 +362,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject): # Override this dependency to have consistent results in subsequent # dependency lookups. for name in self.names: - for_machine = self.interpreter.machine_from_native_kwarg(kwargs) + for_machine = T.cast('MachineChoice', kwargs['native']) identifier = dependencies.get_dep_identifier(name, kwargs) if identifier not in self.build.dependency_overrides[for_machine]: self.build.dependency_overrides[for_machine][identifier] = \ |
