--- elwix/build_world.sh 2014/01/14 14:25:23 1.3.2.1 +++ elwix/build_world.sh 2014/01/15 08:44:56 1.3.2.2 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_world.sh,v 1.3.2.1 2014/01/14 14:25:23 misho Exp $ +# $Id: build_world.sh,v 1.3.2.2 2014/01/15 08:44:56 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -52,7 +52,7 @@ build_toolchain() cd $BSDSRC env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - SRCCONF=${SRCCONF} DESTDIR=${WORLD} toolchain + SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} toolchain if [ $? -eq 0 ]; then cd - else @@ -67,11 +67,11 @@ build_world() if [ -z "$1" ]; then env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - SRCCONF=${SRCCONF} buildworld + SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld else env MAKEOBJDIRPREFIX=${BSDOBJ} NO_CLEAN="YES" make ${PARALLEL_BUILD} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - SRCCONF=${SRCCONF} buildworld + SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld fi if [ $? -eq 0 ]; then cd - @@ -86,7 +86,7 @@ install_world() cd $BSDSRC env MAKEOBJDIRPREFIX=${BSDOBJ} make \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - SRCCONF=${SRCCONF} DESTDIR=${WORLD} installworld + SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} installworld cd - if [ $? -eq 0 ]; then