diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2023-01-20 07:30:52 -0500 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-02-06 23:37:25 +0530 |
| commit | 10a1fbd813ab8329f2a99a721595eed6a9c36357 (patch) | |
| tree | 11c07b3124e75464d3c2eeea3bdbecd0de805cc6 | |
| parent | c38efc187013834b3a78d546565d7484e63dd6d6 (diff) | |
| download | meson-10a1fbd813ab8329f2a99a721595eed6a9c36357.zip meson-10a1fbd813ab8329f2a99a721595eed6a9c36357.tar.gz meson-10a1fbd813ab8329f2a99a721595eed6a9c36357.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 b25d73b..f4b9d7b 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -146,6 +146,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 devenv, varnames = get_env(b, options.dump) if options.dump: if options.devcmd: @@ -166,8 +167,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}]' |