diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-05-12 10:57:43 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-05-14 12:15:03 -0700 |
commit | c64715b99a310e031fd145c64b111891861e4ddc (patch) | |
tree | b6f69a64c29d68c124eaf8fa9e8cf2b6473e7b74 /mesonbuild/optinterpreter.py | |
parent | e35584e9ff33a2cba8128487b14b0a3dcfe9fbc5 (diff) | |
download | meson-c64715b99a310e031fd145c64b111891861e4ddc.zip meson-c64715b99a310e031fd145c64b111891861e4ddc.tar.gz meson-c64715b99a310e031fd145c64b111891861e4ddc.tar.bz2 |
optinterpreter: Enable and update FeatureNew to use_single
With the version information fixed we can use a FeatureNew inside the
optinterpreter, so let's do it.
Diffstat (limited to 'mesonbuild/optinterpreter.py')
-rw-r--r-- | mesonbuild/optinterpreter.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index c13cc5d..dfbe6d7 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -16,10 +16,11 @@ import re import functools import typing as T -from . import mparser +from . import compilers from . import coredata from . import mesonlib -from . import compilers +from . import mparser +from .interpreterbase import FeatureNew forbidden_option_names = set(coredata.builtin_options.keys()) forbidden_prefixes = [lang + '_' for lang in compilers.all_languages] + ['b_', 'backend_'] @@ -200,11 +201,8 @@ class OptionInterpreter: raise OptionException('Only calls to option() are allowed in option files.') (posargs, kwargs) = self.reduce_arguments(node.args) - # FIXME: Cannot use FeatureNew while parsing options because we parse - # it before reading options in project(). See func_project() in - # interpreter.py - #if 'yield' in kwargs: - # FeatureNew('option yield', '0.45.0').use(self.subproject) + if 'yield' in kwargs: + FeatureNew.single_use('option yield', '0.45.0', self.subproject) if 'type' not in kwargs: raise OptionException('Option call missing mandatory "type" keyword argument') |