From 17dff9d57b0ff449d9b1a92e210e5e2dc9048e9e Mon Sep 17 00:00:00 2001 From: Charles Brunet Date: Tue, 27 Feb 2024 20:59:33 -0500 Subject: [PATCH] Revert "Fix base options not reconfigurable" This reverts commit 98db3e7a2e498a6d96ec50b39ef51ef312d6f0a3. --- mesonbuild/coredata.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index e6e831a2f9cb..25a506848b2b 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -1003,11 +1003,9 @@ def set_default_options(self, default_options: T.MutableMapping[OptionKey, str], # not differ between them even when they are valid for both. if subproject and k.is_builtin() and self.options[k.evolve(subproject='', machine=MachineChoice.HOST)].yielding: continue - # Skip compiler and backend options, they are handled when + # Skip base, compiler, and backend options, they are handled when # adding languages and setting backend. - if k.type in {OptionType.COMPILER, OptionType.BACKEND}: - continue - if k.type == OptionType.BASE and env.first_invocation: + if k.type in {OptionType.COMPILER, OptionType.BACKEND, OptionType.BASE}: continue options[k] = v