Skip to content

Commit 697dbd0

Browse files
bonzinieli-schwartz
authored andcommitted
options: accept build options in --reconfigure or "meson configure"
Make more of the first-invocation logic apply to subsequent configuration of the build tree. This also opens the door for using set_option_maybe_root for the first invocation. This is a huge cleanup but also a larger change, and therefore not something for stable branches. Leave it for later. Signed-off-by: Paolo Bonzini <[email protected]> (cherry picked from commit 1ac86c1)
1 parent f372a56 commit 697dbd0

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

mesonbuild/options.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,9 @@ def replace(v: str) -> str:
10551055
return changed
10561056

10571057
def set_option_maybe_root(self, o: OptionKey, new_value: str) -> bool:
1058+
if not self.is_cross and o.is_for_build():
1059+
return False
1060+
10581061
if o in self.options:
10591062
return self.set_option(o, new_value)
10601063
if self.accept_as_pending_option(o):

0 commit comments

Comments
 (0)