From 10a1fbd813ab8329f2a99a721595eed6a9c36357 Mon Sep 17 00:00:00 2001
From: Charles Brunet <charles.brunet@optelgroup.com>
Date: Fri, 20 Jan 2023 07:30:52 -0500
Subject: devenv should import env vars from vsenv

---
 mesonbuild/mdevenv.py | 3 +--
 1 file changed, 1 insertion(+), 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}]'
-- 
cgit v1.1