Merge pull request #20650 from charris/backport-20640

charris · web-flow · commit 47b45140ed26 · 2021-12-23T14:46:50.000-07:00
BUG: Support env argument in CCompiler.spawn
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py
@@ -109,7 +109,7 @@ class where more documentation can be found.
 
 
 # Using customized CCompiler.spawn.
-def CCompiler_spawn(self, cmd, display=None):
+def CCompiler_spawn(self, cmd, display=None, env=None):
     """
     Execute a command in a sub-process.
 
@@ -120,6 +120,7 @@ def CCompiler_spawn(self, cmd, display=None):
     display : str or sequence of str, optional
         The text to add to the log file kept by `numpy.distutils`.
         If not given, `display` is equal to `cmd`.
+    env: a dictionary for environment variables, optional
 
     Returns
     -------
@@ -131,16 +132,17 @@ def CCompiler_spawn(self, cmd, display=None):
         If the command failed, i.e. the exit status was not 0.
 
     """
+    env = env if env is not None else dict(os.environ)
     if display is None:
         display = cmd
         if is_sequence(display):
             display = ' '.join(list(display))
     log.info(display)
     try:
         if self.verbose:
-            subprocess.check_output(cmd)
+            subprocess.check_output(cmd, env=env)
         else:
-            subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+            subprocess.check_output(cmd, stderr=subprocess.STDOUT, env=env)
     except subprocess.CalledProcessError as exc:
         o = exc.output
         s = exc.returncode
