aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xutils/llvmbuild8
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/llvmbuild b/utils/llvmbuild
index 56a429f..f20bb06 100755
--- a/utils/llvmbuild
+++ b/utils/llvmbuild
@@ -318,8 +318,10 @@ class Builder(threading.Thread):
if not os.path.exists(execdir):
os.makedirs(execdir)
+ execenv = os.environ.copy()
+
for key, value in env.items():
- os.environ[key] = value
+ execenv[key] = value
self.logger.debug("[" + prefix + "] " + "env " + str(env) + " "
+ " ".join(command));
@@ -327,6 +329,7 @@ class Builder(threading.Thread):
try:
proc = subprocess.Popen(command,
cwd=execdir,
+ env=execenv,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
@@ -339,9 +342,6 @@ class Builder(threading.Thread):
except:
traceback.print_exc()
- for key, value in env.items():
- os.environ.pop(key)
-
# Get a list of C++ include directories to pass to clang.
def get_includes(self):
# Assume we're building with g++ for now.