--- elwix/build_world.sh	2012/04/18 15:44:30	1.1.1.1.6.4
+++ elwix/build_world.sh	2014/01/05 23:14:22	1.3
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_world.sh,v 1.1.1.1.6.4 2012/04/18 15:44:30 misho Exp $
+# $Id: build_world.sh,v 1.3 2014/01/05 23:14:22 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -46,16 +46,38 @@ clean_world()
 	rm -f ${CBUILD} ${CGBUILD} ${CENV}
 }
 
+build_toolchain()
+{
+	echo "+++ Build ELWIX Toolchain ..."
+	cd $BSDSRC
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} \
+		DESTDIR=${WORLD} toolchain
+	if [ $? -eq 0 ]; then
+		cd -
+	else
+		exit 1
+	fi
+}
+
 build_world()
 {
 	echo "+++ Build ELWIX World ..."
 	cd $BSDSRC
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		-j${PARALLEL_BUILD} buildworld DESTDIR=${WORLD}
-	if ! $?; then
-		exit 1
+	if [ -z "$1" ]; then
+		env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
+			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+			MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} buildworld
 	else
+		env MAKEOBJDIRPREFIX=${BSDOBJ} NO_CLEAN="YES" make ${PARALLEL_BUILD} \
+			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+			MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} buildworld
+	fi
+	if [ $? -eq 0 ]; then
 		cd -
+	else
+		exit 1
 	fi
 }
 
@@ -63,11 +85,12 @@ install_world()
 {
 	echo "+++ Install ELWIX World ..."
 	cd $BSDSRC
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		installworld DESTDIR=${WORLD}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} DESTDIR=${WORLD} installworld
 	cd -
 
-	if $?; then
+	if [ $? -eq 0 ]; then
 		echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix.ver
 	fi
 }
@@ -83,8 +106,8 @@ build_cross()
 #
 export \\
 _EOF
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		buildenvvars >> ${CENV}
+	make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		MAKEOBJDIRPREFIX=${BSDOBJ} buildenvvars >> ${CENV}
 	cat >>${CENV} <<_EOF
 PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH
 _EOF
@@ -107,8 +130,11 @@ _EOF
 
 ### main()
 if ! SnitVer ${WORLD}/elwix.ver; then
-	clean_world
-	build_world
+	if [ -z "$1" ]; then
+		clean_world
+	fi
+#	build_toolchain $1
+	build_world $1
 	install_world
 
 	build_cross