From c1a4802fca06a9db8180cdd9921a8ffa0bd91a02 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sun, 18 May 2025 01:10:36 +0200 Subject: options: merge duplicate loops into one Signed-off-by: Paolo Bonzini --- mesonbuild/options.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/options.py b/mesonbuild/options.py index 4d5bb5804..0d0d71b10 100644 --- a/mesonbuild/options.py +++ b/mesonbuild/options.py @@ -1318,14 +1318,7 @@ class OptionStore: # ignore subprojects for now for machine file and command line # options; they are applied later - 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(): - continue - if not key.subproject: - self.set_user_option(key, valstr, True) - for key, valstr in cmd_line_options.items(): + for key, valstr in itertools.chain(machine_file_options.items(), cmd_line_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(): -- cgit v1.2.3