commit 03f0a038578ca86e93408bdc7c00e5ac8f1a3578
author Colin Cross <ccross@android.com> Tue Feb 16 21:08:59 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 16 21:08:59 2016 +0000
tree d656931330867af847e72fc093387d84eb1f6833
parent fa23072e8d1af76facbf38dbbf043ff15d77b627
parent d8f0d68b78e968c5d014a9bac9463dbcf522b1c5

Merge "makeparallel: unset MAKEFLAGS and MAKELEVEL"

tools/makeparallel/makeparallel.cpp

diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index cf125fa..3c39846 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -341,6 +341,8 @@
     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);