From 685b9af718ce9f62a05847311053826dc18b4f1e Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sun, 15 May 2022 10:40:51 -0700
Subject: [PATCH] Move setting the environment variables into getMSVCInfo

---
 build.py             | 7 +------
 buildtools/config.py | 8 +++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.py b/build.py
index 8bb77fde..3fc4c2b5 100755
--- a/build.py
+++ b/build.py
@@ -792,12 +792,7 @@ def checkCompiler(quiet=False):
         # about time to do away with this...)
 
         arch = 'x64' if PYTHON_ARCH == '64bit' else 'x86'
-        info = getMSVCInfo(PYTHON, arch)
-
-        os.environ['PATH'] =    info.path
-        os.environ['INCLUDE'] = info.include
-        os.environ['LIB'] =     info.lib
-        os.environ['LIBPATH'] = info.libpath
+        info = getMSVCInfo(PYTHON, arch, set_env=True)
 
         # Make sure there is now a cl.exe on the PATH
         CL = 'NOT FOUND'
diff --git a/buildtools/config.py b/buildtools/config.py
index 3f593893..cbfd0ca4 100644
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -981,7 +981,7 @@ def getExpectedVisCVersion():
 
 
 MSVCinfo = None
-def getMSVCInfo(PYTHON, arch):
+def getMSVCInfo(PYTHON, arch, set_env=False):
     """
     Fetch info from the system about MSVC, such as versions, paths, etc.
     """
@@ -1005,6 +1005,12 @@ def getMSVCInfo(PYTHON, arch):
     env = eval(runcmd('"%s" -c "%s"' % (PYTHON, cmd), getOutput=True, echoCmd=False))
     info = AttrDict(env)
 
+    if set_env:
+        os.environ['PATH'] =    info.path
+        os.environ['INCLUDE'] = info.include
+        os.environ['LIB'] =     info.lib
+        os.environ['LIBPATH'] = info.libpath
+
     MSVCinfo = info
     return info