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

Merge "makeparallel: reset make\'s unlimited stack"

Browse Source 
am: a034129

* commit 'a034129176d8821efc2bc8d33e06d9aeb4d3fd16':
  makeparallel: reset make's unlimited stack

Change-Id: I6e159629c5fe2441f53e0e2687ab0e0478b68499
This commit is contained in:
Colin Cross
2016-04-07 18:09:32 +00:00
committed by android-build-merger
parent 06af80f6c4 a034129176
commit 15f63e262e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/makeparallel/makeparallel.cpp
View File

@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -343,6 +344,15 @@ int main(int argc, char* argv[]) {
// child
unsetenv("MAKEFLAGS");
unsetenv("MAKELEVEL");
// make 3.81 sets the stack ulimit to unlimited, which may cause problems
// for child processes
struct rlimit rlim{};
if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur == RLIM_INFINITY) {
rlim.rlim_cur = 8*1024*1024;
setrlimit(RLIMIT_STACK, &rlim);
}
int ret = execvp(path, args.data());
if (ret < 0) {
error(errno, errno, "exec %s failed", path);