summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2020-04-17 12:27:11 +0200
committerKarel Kočí <cynerd@email.cz>2020-04-17 12:29:39 +0200
commitba4b4a27138239ec32b1bf643b2763c0243aa8f8 (patch)
treead7376d11dcfa5b4bd3deaf987c7c391e06d3ff0
parent81e79116d574e06442b358cbab0928641ff42d36 (diff)
downloadlaminar-cnf-ba4b4a27138239ec32b1bf643b2763c0243aa8f8.tar.gz
laminar-cnf-ba4b4a27138239ec32b1bf643b2763c0243aa8f8.tar.bz2
laminar-cnf-ba4b4a27138239ec32b1bf643b2763c0243aa8f8.zip
Run on all CPUs but litmit load to number of CPUs
This at maximum spawns twice amount of jobs as there are CPUs on system.
-rw-r--r--files/alpine/abuild.conf4
-rwxr-xr-xtemplates/turris.run4
2 files changed, 4 insertions, 4 deletions
diff --git a/files/alpine/abuild.conf b/files/alpine/abuild.conf
index c339d25..cdef73b 100644
--- a/files/alpine/abuild.conf
+++ b/files/alpine/abuild.conf
@@ -4,8 +4,8 @@ export CXXFLAGS="$CFLAGS"
export CPPFLAGS="$CFLAGS"
export LDFLAGS="-Wl,--as-needed"
-export JOBS=4
-export MAKEFLAGS="-j$JOBS"
+export JOBS=$(($(nproc) * 2))
+export MAKEFLAGS="-j$JOBS -l$(nproc)"
USE_COLORS=1
diff --git a/templates/turris.run b/templates/turris.run
index ad6bd8e..359a425 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -2,8 +2,8 @@
# vim: ft=sh
. "$(dirname "$(readlink -f "$0")")/../job.common"
###################################################
-parallel=-j4
-make="make -j4 IS_TTY=1 BUILD_LOG=1"
+parallel=-j$(($(nproc) * 2)) -l$(nproc)
+make="make $paralel IS_TTY=1 BUILD_LOG=1"
if [ "$V" -ge 1 ]; then
parallel=-j1
make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99"