Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use new optionkey.is_* methods

This commit is contained in:
Dylan Baker 2020-12-02 09:57:47 -08:00
parent 30ec7612c8
commit 615686fd6d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/ast/introspection.py
View File

@ -125,7 +125,7 @@ class IntrospectionInterpreter(AstInterpreter):
self.do_subproject(i) self.do_subproject(i)
self.coredata.init_backend_options(self.backend) self.coredata.init_backend_options(self.backend)
options = {k: v for k, v in self.environment.options.items() if k.name.startswith('backend_')} options = {k: v for k, v in self.environment.options.items() if k.is_backend()}
self.coredata.set_options(options) self.coredata.set_options(options)
self._add_languages(proj_langs, MachineChoice.HOST) self._add_languages(proj_langs, MachineChoice.HOST)

2
mesonbuild/coredata.py
View File

@ -89,7 +89,7 @@ class OptionKey:
internally easier to reason about and produce. internally easier to reason about and produce.
""" """
__slots__ = ['name', 'subproject', 'machine', 'lang', '_hash', '_type'] __slots__ = ['name', 'subproject', 'machine', 'lang', '_hash', 'type']
name: str name: str
subproject: str subproject: str

2
mesonbuild/interpreter.py
View File

@ -3142,7 +3142,7 @@ external dependencies (including libraries) must go to "dependencies".''')
if self.environment.first_invocation: if self.environment.first_invocation:
self.coredata.init_backend_options(backend) self.coredata.init_backend_options(backend)
options = {k: v for k, v in self.environment.options.items() if k.name.startswith('backend_')} options = {k: v for k, v in self.environment.options.items() if k.is_backend()}
self.coredata.set_options(options) self.coredata.set_options(options)
@stringArgs @stringArgs