--- elwix/build_world.sh	2012/10/12 08:22:43	1.2
+++ elwix/build_world.sh	2014/09/15 19:06:42	1.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_world.sh,v 1.2 2012/10/12 08:22:43 misho Exp $
+# $Id: build_world.sh,v 1.4 2014/09/15 19:06:42 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -37,6 +37,9 @@ if [ "${USER}" != "root" ]; then
 	exit 1
 fi
 
+# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
+
 clean_world()
 {
 	echo "+++ Clean ELWIX World ..."
@@ -46,12 +49,33 @@ 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} ${X_TARGET_CPUTYPE} \
+		SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} 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 [ -z "$1" ]; then
+		env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
+			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+			SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld
+	else
+		env MAKEOBJDIRPREFIX=${BSDOBJ} NO_CLEAN="YES" make ${PARALLEL_BUILD} \
+			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+			SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld
+	fi
 	if [ $? -eq 0 ]; then
 		cd -
 	else
@@ -63,8 +87,9 @@ 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} ${X_TARGET_CPUTYPE} \
+		SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} installworld
 	cd -
 
 	if [ $? -eq 0 ]; then
@@ -83,10 +108,15 @@ build_cross()
 #
 export \\
 _EOF
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		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
+
+if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then
+	MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"
+fi
+
 _EOF
 	cd -
 	cp ${CENV} ${CBUILD}
@@ -107,8 +137,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