StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't pass empty arguments to ninja" am: f8acdc50fa am: d4aba70550 am: ac15f41714

Browse Source 
am: 239c78a5b3

Change-Id: Icbd643898cc9babb09090525aa7f0961cf9a04c9
This commit is contained in:
Colin Cross
2017-01-19 06:56:22 +00:00
committed by android-build-merger
parent 2b22ec459d 239c78a5b3
commit 366902561d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/makeparallel/makeparallel.cpp
View File

@@ -338,13 +338,17 @@ int main(int argc, char* argv[]) {
// ninja is parallel by default, pass -j1 to disable parallelism if make wasn't parallel // ninja is parallel by default, pass -j1 to disable parallelism if make wasn't parallel
args.push_back(strdup("-j1")); args.push_back(strdup("-j1"));
} else { } else {
args.push_back(strdup(jarg.c_str())); if (jarg != "") {
args.push_back(strdup(jarg.c_str()));
}
} }
if (keep_going) { if (keep_going) {
args.push_back(strdup("-k0")); args.push_back(strdup("-k0"));
} }
} else { } 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]); args.insert(args.end(), &argv[2], &argv[argc]);