make.sh limit build to 23 parallel threads.

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

diff --git a/make.sh b/make.sh
index 5f619d30b392b383eef0f545638de632390f8d14..16d6eddff1bb64cf9a94e1cf72d89d44d67d037c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -217,6 +217,12 @@ configure_build() {
                        parallelism=${cpu_max}
                fi
 
+               # limit to -j23 because perl will not build
+               # more
+               if [ ${parallelism} -gt 23 ]; then
+                       parallelism=23
+               fi
+
                MAKETUNING="-j${parallelism}"
        fi
 }
@@ -433,19 +439,6 @@ prepareenv() {
        # Set LFS Directory
        LFS=$BASEDIR/build
 
-       # Check ${TOOLS_DIR} symlink
-       if [ -h "${TOOLS_DIR}" ]; then
-         rm -f "${TOOLS_DIR}"
-       fi
-
-       if [ ! -e "${TOOLS_DIR}" ]; then
-          ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}"
-       fi
-
-       if [ ! -h "${TOOLS_DIR}" ]; then
-         exiterror "Could not create ${TOOLS_DIR} symbolic link"
-       fi
-
        # Setup environment
        set +h
        LC_ALL=POSIX
@@ -640,7 +633,7 @@ lfsmake2() {
        local PS1='\u:\w$ '
 
        enterchroot \
-               bash -x -c "cd /usr/src/lfs && \
+               ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
                        MAKETUNING=${MAKETUNING} \
                        make -f $* \
                        LFS_BASEDIR=/usr/src install" \
@@ -910,6 +903,19 @@ buildtoolchain() {
                exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain."
        fi
 
+       # Check ${TOOLS_DIR} symlink
+       if [ -h "${TOOLS_DIR}" ]; then
+               rm -f "${TOOLS_DIR}"
+       fi
+
+       if [ ! -e "${TOOLS_DIR}" ]; then
+               ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}"
+       fi
+
+       if [ ! -h "${TOOLS_DIR}" ]; then
+               exiterror "Could not create ${TOOLS_DIR} symbolic link"
+       fi
+
        LOGFILE="$BASEDIR/log/_build.toolchain.log"
        export LOGFILE
 
@@ -947,6 +953,7 @@ buildtoolchain() {
        lfsmake1 texinfo
        lfsmake1 xz
        lfsmake1 fake-environ
+       lfsmake1 strip
        lfsmake1 cleanup-toolchain
 }
 
@@ -1525,7 +1532,8 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  lfsmake1 strip
+  # use toolchain bash for chroot to strip
+  EXTRA_PATH=${TOOLS_DIR}/bin/ lfsmake2 strip
 }
 
 buildpackages() {