commit f8acdc50fa88eb5b3cd819547a93408ea65fb8eb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 19 06:43:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 06:43:46 2017 +0000
tree 31e18986c54df6b2491903bec4fbea3681183f01
parent bb5c13d359068c65d9271a30e0442a9a8cdb24df
parent 524c868107e561aa47ac209f5a81b4313ab77e66

Merge "Don't pass empty arguments to ninja"

tools/makeparallel/makeparallel.cpp

diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index b906681..0e1e45c 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -338,13 +338,17 @@
       // ninja is parallel by default, pass -j1 to disable parallelism if make wasn't parallel
       args.push_back(strdup("-j1"));
     } else {
-      args.push_back(strdup(jarg.c_str()));
+      if (jarg != "") {
+        args.push_back(strdup(jarg.c_str()));
+      }
     }
     if (keep_going) {
       args.push_back(strdup("-k0"));
     }
   } else {
-    args.push_back(strdup(jarg.c_str()));
+    if (jarg != "") {
+      args.push_back(strdup(jarg.c_str()));
+    }
   }
 
   args.insert(args.end(), &argv[2], &argv[argc]);