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

options: machine_file_options keys are always OptionKeys 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-05-05 13:18:41 +02:00 committed by Dylan Baker
parent 01da0686f6
commit 4219f0e978
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mesonbuild/options.py
View File

@ -1301,12 +1301,7 @@ class OptionStore:
if project_default_options is None: if project_default_options is None:
project_default_options = {} project_default_options = {}
assert isinstance(machine_file_options, dict) assert isinstance(machine_file_options, dict)
for keystr, valstr in machine_file_options.items(): for key, valstr in machine_file_options.items():
if isinstance(keystr, str):
# FIXME, standardise on Key or string.
key = OptionKey.from_string(keystr)
else:
key = keystr
# Due to backwards compatibility we ignore all build-machine options # Due to backwards compatibility we ignore all build-machine options
# when building natively. # when building natively.
if not self.is_cross and key.is_for_build(): if not self.is_cross and key.is_for_build():