Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Fix base options not reconfigurable" 

This reverts commit 98db3e7a2e498a6d96ec50b39ef51ef312d6f0a3.
This commit is contained in:
Charles Brunet 2024-02-27 20:59:33 -05:00 committed by Dylan Baker
parent aee941559c
commit c67a6e1d7c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/coredata.py
View File

@ -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