aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-02-05 00:10:20 -0800
committerColin Cross <ccross@android.com>2016-02-05 00:10:20 -0800
commitd8f0d68b78e968c5d014a9bac9463dbcf522b1c5 (patch)
treee82f44801cf6216babb2bf233bcb04967c1df671
parent481cc5a005a59b2f2d61efa0e3d7ce719f126612 (diff)
downloadbuild-d8f0d68b78e968c5d014a9bac9463dbcf522b1c5.tar.gz
makeparallel: unset MAKEFLAGS and MAKELEVEL
makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make through the environment, but they should not be propagated to the child process in case the child process tries to run make again. Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
-rw-r--r--tools/makeparallel/makeparallel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index cf125faa3a..3c39846ecd 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -341,6 +341,8 @@ int main(int argc, char* argv[]) {
error(errno, errno, "fork failed");
} else if (pid == 0) {
// child
+ unsetenv("MAKEFLAGS");
+ unsetenv("MAKELEVEL");
int ret = execvp(path, args.data());
if (ret < 0) {
error(errno, errno, "exec %s failed", path);