Skip to content

Commit

Permalink
Revert "Fix base options not reconfigurable"
Browse files Browse the repository at this point in the history
This reverts commit 98db3e7.
  • Loading branch information
bruchar1 committed Feb 28, 2024
1 parent e9ee63e commit 17dff9d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions mesonbuild/coredata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 17dff9d

Please sign in to comment.