devenv should import env vars from vsenv
@@ -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}]'
