diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-05-29 16:29:17 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-05-30 12:26:19 -0400 |
| commit | 194c28297f3c5a75c4b9918b78742aaabb0a6703 (patch) | |
| tree | 25077e1f87f3a519e6356fb3741494490a6d9141 /mesonbuild/interpreter | |
| parent | 915a468ed32feb5bed2bd4e60fefc5754e961a6c (diff) | |
| download | meson-194c28297f3c5a75c4b9918b78742aaabb0a6703.zip meson-194c28297f3c5a75c4b9918b78742aaabb0a6703.tar.gz meson-194c28297f3c5a75c4b9918b78742aaabb0a6703.tar.bz2 | |
fix incorrectly allowed kwarg for custom_target
override_options makes no sense for custom_target as we don't use it for
anything. Also, this was added in commit c3c30d4b060239654c9b848092692ab346ebed9d
despite not being allowed in permittedKwargsc3c30d4b0.
For inexplicable reasons, we had a known_kwargs for custom_target that
looped over kwargs and issued a warning, not an error, for unknown
kwargs. It was impossible to ever hit that check to begin with, though,
ever since commit e08d73510552fa4a3a087af1a9e5fded8f5749fd which added
permittedKwargs and obsoleted those manual checks with real errors.
So at one point override_options was specially permitted to be used
without emitting a warning, and then for about half a decade it was an
error, and then based on some dead code it was allowed again for a bit.
But through all this it doesn't do anything and isn't documented.
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index df00ed3..7b87843c 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -71,7 +71,7 @@ from .type_checking import ( CT_INSTALL_TAG_KW, INSTALL_TAG_KW, LANGUAGE_KW, - NATIVE_KW, OVERRIDE_OPTIONS_KW, + NATIVE_KW, REQUIRED_KW, NoneType, in_set_validator, @@ -1857,7 +1857,6 @@ class Interpreter(InterpreterBase, HoldableObject): ENV_KW.evolve(since='0.57.0'), INSTALL_KW, INSTALL_MODE_KW.evolve(since='0.47.0'), - OVERRIDE_OPTIONS_KW, KwargInfo('feed', bool, default=False, since='0.59.0'), KwargInfo('capture', bool, default=False), KwargInfo('console', bool, default=False, since='0.48.0'), @@ -1948,7 +1947,6 @@ class Interpreter(InterpreterBase, HoldableObject): install_dir=kwargs['install_dir'], install_mode=kwargs['install_mode'], install_tag=kwargs['install_tag'], - override_options=kwargs['override_options'], backend=self.backend) self.add_target(tg.name, tg) return tg diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index bb56ff2..c4b6b08 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -11,7 +11,7 @@ from typing_extensions import TypedDict, Literal, Protocol from .. import build from .. import coredata from ..compilers import Compiler -from ..mesonlib import MachineChoice, File, FileMode, FileOrString, OptionKey +from ..mesonlib import MachineChoice, File, FileMode, FileOrString from ..modules.cmake import CMakeSubprojectOptions from ..programs import ExternalProgram @@ -187,7 +187,6 @@ class CustomTarget(TypedDict): install_mode: FileMode install_tag: T.List[T.Optional[str]] output: T.List[str] - override_options: T.Dict[OptionKey, str] class AddTestSetup(TypedDict): |