aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-03-07 11:54:39 +0100
committerBjörn Gustavsson <[email protected]>2017-03-08 07:33:20 +0100
commitcc96d254379776c83aa85bad397a24fc4365c5c6 (patch)
tree78613fae04fd361f9005a91829a1137e2ea0ee47
parenta434fa4622023560e2877a1de698fd4fd15e6b31 (diff)
downloadotp-cc96d254379776c83aa85bad397a24fc4365c5c6.tar.gz
otp-cc96d254379776c83aa85bad397a24fc4365c5c6.tar.bz2
otp-cc96d254379776c83aa85bad397a24fc4365c5c6.zip
Reduce number of jobs for make
Running fewer jobs in parallel reduces the risk of running out of memory.
-rw-r--r--.travis.yml2
-rw-r--r--scripts/Dockerfile.322
-rw-r--r--scripts/Dockerfile.642
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 414107e10f..8fc3478379 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ before_script:
- export ERL_TOP=$PWD
- export PATH=$ERL_TOP/bin:$PATH
- export ERL_LIBS=''
- - export MAKEFLAGS=-j6
+ - export MAKEFLAGS=-j4
script:
- ./scripts/build-otp
diff --git a/scripts/Dockerfile.32 b/scripts/Dockerfile.32
index 9622c48a17..01025340f7 100644
--- a/scripts/Dockerfile.32
+++ b/scripts/Dockerfile.32
@@ -8,6 +8,6 @@ RUN tar xzf otp.tar.gz
WORKDIR /buildroot/otp/
-ENV MAKEFLAGS -j10
+ENV MAKEFLAGS -j4
CMD ./scripts/build-otp
diff --git a/scripts/Dockerfile.64 b/scripts/Dockerfile.64
index 47702b04a5..c08184d10a 100644
--- a/scripts/Dockerfile.64
+++ b/scripts/Dockerfile.64
@@ -8,6 +8,6 @@ RUN tar xzf otp.tar.gz
WORKDIR /buildroot/otp/
-ENV MAKEFLAGS -j10
+ENV MAKEFLAGS -j4
CMD ./scripts/build-otp