diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2023-09-29 13:13:09 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2023-10-17 08:09:06 -0700 |
| commit | 357abf51c5a07efd1dabe916aa80790618dd5403 (patch) | |
| tree | 552b53e2f6517efa4b7d0922e6449d8ac2c11ad7 | |
| parent | 2fc872907813fa58a13f029bcf2a85924decf067 (diff) | |
| download | meson-357abf51c5a07efd1dabe916aa80790618dd5403.tar.gz | |
interpreter: use typed_kwargs for build_target.native
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 166e99085..1ff852b60 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -3300,7 +3300,7 @@ class Interpreter(InterpreterBase, HoldableObject): build_target_decorator_caller(self, node, args, kwargs) name, sources = args - for_machine = self.machine_from_native_kwarg(kwargs) + for_machine = kwargs['native'] if kwargs.get('rust_crate_type') == 'proc-macro': # Silently force to native because that's the only sensible value # and rust_crate_type is deprecated any way. diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index 546523adf..7af146a78 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -328,6 +328,7 @@ class _BaseBuildTarget(TypedDict): build_by_default: bool install: bool install_mode: FileMode + native: MachineChoice override_options: T.Dict[OptionKey, T.Union[str, int, bool, T.List[str]]] depend_files: NotRequired[T.List[File]] diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index dc055f108..87e656273 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -555,6 +555,7 @@ _ALL_TARGET_KWS: T.List[KwargInfo] = [ KwargInfo('build_by_default', bool, default=True, since='0.38.0'), INSTALL_KW, INSTALL_MODE_KW, + NATIVE_KW, ] # Applies to all build_target classes except jar diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index c8af224f8..432962cee 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -197,7 +197,7 @@ class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']): # into the linker path when not running in debug mode via a series #pragma comment(lib, "") # directives. We manually override these here as this interferes with the intended # use of the 'limited_api' kwarg - for_machine = self.interpreter.machine_from_native_kwarg(kwargs) + for_machine = kwargs['native'] compilers = self.interpreter.environment.coredata.compilers[for_machine] if any(compiler.get_id() == 'msvc' for compiler in compilers.values()): pydep_copy = copy.copy(pydep) |