diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-05-18 01:10:36 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-06 14:44:31 -0700 |
| commit | c1a4802fca06a9db8180cdd9921a8ffa0bd91a02 (patch) | |
| tree | 7828cd6f8f24d4915303909a3fb1d071702d1a35 | |
| parent | a77eb5f2c9a0bbcd387c67f5fe24bb63b6daf8fe (diff) | |
| download | meson-c1a4802fca06a9db8180cdd9921a8ffa0bd91a02.tar.gz | |
options: merge duplicate loops into one
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | mesonbuild/options.py | 9 |
1 files changed, 1 insertions, 8 deletions
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(): |