From ba4b4a27138239ec32b1bf643b2763c0243aa8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Fri, 17 Apr 2020 12:27:11 +0200 Subject: 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. --- files/alpine/abuild.conf | 4 ++-- templates/turris.run | 4 ++-- 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" -- cgit v1.2.3