X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=f4d474d364c2c19a8f5fe87ded8561f01251bd6a;hp=175db5191e4e9f602409e46048ee4ff5f4031a3a;hb=a98ab1d7fdba5d18d42faab43bf03662ca4d4261;hpb=4f1cce84fb8217589b67dd3244fd3f8ccbe14e3d diff --git a/make.sh b/make.sh index 175db5191e..f4d474d364 100755 --- a/make.sh +++ b/make.sh @@ -62,16 +62,17 @@ export BASEDIR LOGFILE DIR_CHK=$BASEDIR/cache/check mkdir $BASEDIR/log/ 2>/dev/null +# Load configuration file +if [ -f .config ]; then + . .config +fi + # Include funtions . tools/make-functions # Get the amount of memory in this build system HOST_MEM=$(system_memory) -if [ -f .config ]; then - . .config -fi - if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" elif [ -n "${TARGET_ARCH}" ]; then @@ -176,11 +177,6 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - if [ -z $MAKETUNING ]; then - CPU_COUNT="$(system_processors)" - - MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))" - fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD