X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=5647ecb97c7937416d106240540cdf32826883ca;hp=e3f32b73741f40927c0d6b8599bb090586093dbe;hb=2723ef8721862b9d9565346bae8115773123e53e;hpb=050479e93e183f4c8ff2aa2069abf4d653be71d3;ds=sidebyside diff --git a/make.sh b/make.sh index e3f32b7374..5647ecb97c 100755 --- 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 } @@ -627,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" \ @@ -1526,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() {