diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-01-19 13:39:51 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-03-29 09:33:41 -0400 |
| commit | b30cd5d2d587546eac8b560a8c311a52d69fb53e (patch) | |
| tree | bd20ed04fbe5f5f63044e84a6f612602914217db /mesonbuild/interpreter/interpreter.py | |
| parent | 5dc4fcae34ee3a5a3d47021f8ea8b2c5d3b14ea9 (diff) | |
| download | meson-b30cd5d2d587546eac8b560a8c311a52d69fb53e.zip meson-b30cd5d2d587546eac8b560a8c311a52d69fb53e.tar.gz meson-b30cd5d2d587546eac8b560a8c311a52d69fb53e.tar.bz2 | |
Make --vsenv a readonly builtin option
We need to remember its value when reconfiguring, but the Build object
is not reused, only coredata is.
This also makes CLI more consistent by allowing `-Dvsenv=true` syntax.
Fixes: #11309
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 72bc8e2..bbc34a4 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1291,9 +1291,9 @@ class Interpreter(InterpreterBase, HoldableObject): # vs backend version we need. But after setting default_options in case # the project sets vs backend by default. backend = self.coredata.get_option(OptionKey('backend')) - force_vsenv = self.user_defined_options.vsenv or backend.startswith('vs') - if mesonlib.setup_vsenv(force_vsenv): - self.build.need_vsenv = True + vsenv = self.coredata.get_option(OptionKey('vsenv')) + force_vsenv = vsenv or backend.startswith('vs') + mesonlib.setup_vsenv(force_vsenv) self.add_languages(proj_langs, True, MachineChoice.HOST) self.add_languages(proj_langs, False, MachineChoice.BUILD) |