make.sh: Introduce DEFAULT_PARALLELISM

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index d821fed4acabfdddab56a3b5f904c732e16235fd..92f1ffa601e4c9e827a78e4021f2ffc44383c2ea 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -205,10 +205,8 @@ configure_build() {
                # We assume that each process consumes about
                # 192MB of memory. Therefore we find out how
                # many processes fit into memory.
-               local mem_max=$(( ${HOST_MEM} / 192 ))
-
-               local processors="$(system_processors)"
-               local cpu_max=$(( ${processors} + 1 ))
+               local mem_max=$(( ${SYSTEM_MEMORY} / 192 ))
+               local cpu_max=$(( ${SYSTEM_PROCESSORS} + 1 ))
 
                local parallelism
                if [ ${mem_max} -lt ${cpu_max} ]; then
@@ -217,6 +215,9 @@ configure_build() {
                        parallelism=${cpu_max}
                fi
 
+               # Use this as default PARALLELISM
+               DEFAULT_PARALLELISM="${parallelism}"
+
                # limit to -j23 because perl will not build
                # more
                if [ ${parallelism} -gt 23 ]; then
@@ -237,7 +238,7 @@ configure_build() {
        # We need to limit memory because XZ uses too much when running
        # in parallel and it isn't very smart in limiting itself.
        # We allow XZ to use up to 70% of all system memory.
-       local xz_memory=$(( HOST_MEM * 7 / 10 ))
+       local xz_memory=$(( SYSTEM_MEMORY * 7 / 10 ))
 
        # XZ memory cannot be larger than 2GB on 32 bit systems
        case "${build_arch}" in
@@ -469,7 +470,7 @@ prepareenv() {
        # Setup environment
        set +h
        LC_ALL=POSIX
-       export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
+       export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM MAKETUNING
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
        # Make some extra directories
@@ -554,6 +555,7 @@ enterchroot() {
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                KVER="${KVER}" \
                XZ_OPT="${XZ_OPT}" \
+               DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
                SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
                SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
                $(fake_environ) \
@@ -636,6 +638,7 @@ lfsmake1() {
                CFLAGS="${CFLAGS}" \
                CXXFLAGS="${CXXFLAGS}" \
                MAKETUNING="${MAKETUNING}" \
+               DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
                SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
                SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
                make -f $* \
@@ -915,9 +918,6 @@ fi
 SYSTEM_PROCESSORS="$(system_processors)"
 SYSTEM_MEMORY="$(system_memory)"
 
-# Get the amount of memory in this build system
-HOST_MEM=$(system_memory)
-
 if [ -n "${BUILD_ARCH}" ]; then
        configure_build "${BUILD_ARCH}"
 else