From 4219f0e9784f54299b0c31a2062a63e86e4ea820 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 5 May 2025 13:18:41 +0200 Subject: [PATCH] options: machine_file_options keys are always OptionKeys Signed-off-by: Paolo Bonzini --- mesonbuild/options.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mesonbuild/options.py b/mesonbuild/options.py index 2d96380c4..e0d8f51a0 100644 --- a/mesonbuild/options.py +++ b/mesonbuild/options.py @@ -1301,12 +1301,7 @@ class OptionStore: if project_default_options is None: project_default_options = {} assert isinstance(machine_file_options, dict) - for keystr, valstr in machine_file_options.items(): - if isinstance(keystr, str): - # FIXME, standardise on Key or string. - key = OptionKey.from_string(keystr) - else: - key = keystr + for key, valstr in machine_file_options.items(): # Due to backwards compatibility we ignore all build-machine options # when building natively. if not self.is_cross and key.is_for_build():