From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 8 Jul 2017 13:31:15 +0000 (+0200)
Subject: make-functions: move MAKETUNING before make
X-Git-Tag: v2.19-core114~33
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=fbe365b955c08838da1e255318440fc7b7fac1e2

make-functions: move MAKETUNING before make

this is needed to edit MAKTUNING in the lfs file
which is used by boost and cmake to build on
machines with less than 4GB Memory.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/tools/make-functions b/tools/make-functions
index 508f5f21ee..b419253fa8 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -612,6 +612,7 @@ lfsmake1() {
 		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 		CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" \
+		MAKETUNING="${MAKETUNING}" \
 		make -f $* \
 			TOOLCHAIN=1 \
 			CROSSTARGET="${CROSSTARGET}" \
@@ -621,7 +622,6 @@ lfsmake1() {
 			LFS_BASEDIR="${BASEDIR}" \
 			ROOT="${LFS}" \
 			KVER="${KVER}" \
-			MAKETUNING="${MAKETUNING}" \
 			install >> $LOGFILE 2>&1
 
 	local COMPILE_SUCCESS=$?
@@ -645,8 +645,9 @@ lfsmake2() {
 	local PS1='\u:\w$ '
 
 	enterchroot \
-		bash -x -c "cd /usr/src/lfs && make -f $* \
+		bash -x -c "cd /usr/src/lfs && \
 			MAKETUNING=${MAKETUNING} \
+			make -f $* \
 			LFS_BASEDIR=/usr/src install" \
 		>> ${LOGFILE} 2>&1