]> git.ipfire.org Git - people/mlorenz/ipfire-2.x.git/commitdiff
make-functions: move MAKETUNING before make
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 8 Jul 2017 13:31:15 +0000 (15:31 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 8 Jul 2017 13:31:15 +0000 (15:31 +0200)
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>
tools/make-functions

index 508f5f21eed358d1dad239165270eb9668a49fc8..b419253fa8cd9ea577d65c73e08f4cc811bec128 100644 (file)
@@ -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