From b30cd5d2d587546eac8b560a8c311a52d69fb53e Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 19 Jan 2023 13:39:51 -0500 Subject: 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 --- mesonbuild/mdevenv.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/mdevenv.py') diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py index 7561ed9ab..624fec99e 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -159,7 +159,8 @@ def run(options: argparse.Namespace) -> int: b = build.load(options.builddir) workdir = options.workdir or options.builddir - setup_vsenv(b.need_vsenv) # Call it before get_env to get vsenv vars as well + need_vsenv = T.cast('bool', b.environment.coredata.get_option(OptionKey('vsenv'))) + setup_vsenv(need_vsenv) # Call it before get_env to get vsenv vars as well dump_fmt = options.dump_format if options.dump else None devenv, varnames = get_env(b, dump_fmt) if options.dump: -- cgit v1.2.3