summaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2025-05-05 13:18:41 +0200
committerDylan Baker <dylan@pnwbakers.com>2025-05-07 09:43:43 -0700
commit4219f0e9784f54299b0c31a2062a63e86e4ea820 (patch)
treee738162d5c8929c8a6a5cc0639a5cdfb649ced8b /mesonbuild
parent01da0686f67e6a2f658130c11328be2977db5f90 (diff)
downloadmeson-4219f0e9784f54299b0c31a2062a63e86e4ea820.tar.gz
options: machine_file_options keys are always OptionKeys
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/options.py7
1 files changed, 1 insertions, 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():