--- elwix/build_world.sh	2014/01/15 08:44:56	1.3.2.2
+++ elwix/build_world.sh	2014/01/15 09:09:44	1.3.2.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.3.2.2 2014/01/15 08:44:56 misho Exp $
+# $Id: build_world.sh,v 1.3.2.3 2014/01/15 09:09:44 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}"
+
 clean_world()
 {
 	echo "+++ Clean ELWIX World ..."
@@ -51,7 +54,7 @@ build_toolchain()
 	echo "+++ Build ELWIX Toolchain ..."
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} toolchain
 	if [ $? -eq 0 ]; then
 		cd -
@@ -66,11 +69,11 @@ build_world()
 	cd $BSDSRC
 	if [ -z "$1" ]; then
 		env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
-			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+			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} \
+			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 			SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld
 	fi
 	if [ $? -eq 0 ]; then
@@ -85,7 +88,7 @@ install_world()
 	echo "+++ Install ELWIX World ..."
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} installworld
 	cd -
 
@@ -105,7 +108,7 @@ 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