diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2023-01-20 07:30:52 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-01-20 08:35:31 -0500 |
| commit | ef189b1d361399c2ba504944e51f48f21cdd1f6f (patch) | |
| tree | 3c7302c1ea4e1621108af62c124ce90d42a077ef | |
| parent | c754f9076af88bffce90bec45011d56823401e75 (diff) | |
| download | meson-ef189b1d361399c2ba504944e51f48f21cdd1f6f.zip meson-ef189b1d361399c2ba504944e51f48f21cdd1f6f.tar.gz meson-ef189b1d361399c2ba504944e51f48f21cdd1f6f.tar.bz2 | |
devenv should import env vars from vsenv
| -rw-r--r-- | mesonbuild/mdevenv.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py index ddf53d9..eaed141 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -157,6 +157,7 @@ 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 dump_fmt = options.dump_format if options.dump else None devenv, varnames = get_env(b, dump_fmt) if options.dump: @@ -180,8 +181,6 @@ def run(options: argparse.Namespace) -> int: install_data = minstall.load_install_data(str(privatedir / 'install.dat')) write_gdb_script(privatedir, install_data, workdir) - setup_vsenv(b.need_vsenv) - args = options.devcmd if not args: prompt_prefix = f'[{b.project_name}]' |