diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2024-02-27 20:59:33 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-03-01 12:09:22 -0800 |
| commit | c67a6e1d7cdb7883621eaceda9af08b9eecf34a8 (patch) | |
| tree | a3170f6f48a6138838e210ac295bdc30936a5892 | |
| parent | aee941559c4b88a062e88186819a820c69c200ae (diff) | |
| download | meson-c67a6e1d7cdb7883621eaceda9af08b9eecf34a8.tar.gz | |
Revert "Fix base options not reconfigurable"
This reverts commit 98db3e7a2e498a6d96ec50b39ef51ef312d6f0a3.
| -rw-r--r-- | mesonbuild/coredata.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index e6e831a2f..25a506848 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -1003,11 +1003,9 @@ class CoreData: # 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 |