--- elwix/build_tools.sh	2014/01/15 08:44:56	1.6.6.2
+++ elwix/build_tools.sh	2014/01/20 00:04:35	1.6.6.6
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.6.6.2 2014/01/15 08:44:56 misho Exp $
+# $Id: build_tools.sh,v 1.6.6.6 2014/01/20 00:04:35 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -16,11 +16,13 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	exit 1
 fi
 V=${VERSION}
-[ -r ${CENV} ] && . ${CENV}
+#[ -r ${CENV} ] && . ${CENV}
 unset INSTALL
 unset VERSION
 VERSION="$V"
 
+# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -120,65 +122,65 @@ compile_fbsdtools()
 
 	cd $CROSS_FT_VIMAGE
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 	cd -
 
 	cd $CROSS_FT_ATH
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 	cd -
 
 	cd $CROSS_FT_IPW
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
 	cd -
 
 	cd $CROSS_FT_IWI
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
 	cd -
 
 	cd $CROSS_FT_MWL
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 	cd -
 
 #	cd $CROSS_FT_NET80211
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 #	cd -
 
 #	cd $CROSS_FT_WTAP
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 #	cd -
 }
 
@@ -186,19 +188,19 @@ compile_files()
 {
 	cd files
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} obj
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} depend 
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
 		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
 	cd -
 
@@ -349,21 +351,24 @@ build_tools()
 }
 
 ### main()
-if ! SnitVer ${WORLD}/elwix/elwix.ver; then
-	compile_deps || exit 1
+compile_deps || exit 1
+
+#if ! SnitVer ${WORLD}/elwix/elwix.ver; then
 #	clean_bootstrap
 #	compile_bootstrap || exit 1
+#
+#	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
+#else
+#	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
+#fi
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
-else
-	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
-fi
-
 if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
 	clean_tools
+
 	compile_fbsdtools
 	compile_files
 	compile_tools
+
 	build_tools
 
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver