--- elwix/build_tools.sh	2012/03/20 15:10:06	1.1.2.4
+++ elwix/build_tools.sh	2012/03/22 10:18:12	1.1.2.7
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.1.2.4 2012/03/20 15:10:06 misho Exp $
+# $Id: build_tools.sh,v 1.1.2.7 2012/03/22 10:18:12 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -15,7 +15,11 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	echo
 	exit 1
 fi
+V=${VERSION}
 [ -r ${CENV} ] && . ${CENV}
+unset INSTALL
+unset VERSION
+VERSION="$V"
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -58,6 +62,7 @@ clean_bootstrap()
 
 	install -d ${PKGDIR}
 	install -d ${PKGDIR}/db
+	install -d ${PKGDIR}/etc
 }
 
 compile_bootstrap()
@@ -71,6 +76,27 @@ compile_bootstrap()
 		echo " Skip bootstrap pkgsrc - already inited pkgsrc"
 	fi
 
+	cat >>/elwix/pkg/etc/mk.conf << _EOF
+
+.if defined(USE_CROSS_COMPILE) && !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+USE_DESTDIR=		yes
+DEPENDS_TARGET=		package-install
+
+TOOLDIR=                ${CROSSTOOLDIR}
+CROSS_DESTDIR=		${WORLD}
+
+TARGET=			${TARGET}
+TARGET_ARCH=		${TARGET_ARCH}
+MACHINE_PLATFORM=	FreeBSD-${PLATFORM}-${TARGET_ARCH}
+MACHINE_GNU_PLATFORM=	${TARGET_ARCH}-elwix-freebsd
+
+PKGSRC_COMPILER=	gcc
+USE_PKGSRC_GCC=		no
+USE_NATIVE_GCC=		yes
+
+.endif			# end cross-compilation settings
+_EOF
+
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
 }
 
@@ -146,8 +172,6 @@ compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
 
-	unset INSTALL
-
 	cd $CROSS_AXL
 	${AXL_CFG}
 	${CBUILD} clean
@@ -257,14 +281,14 @@ compile_tools()
 }
 
 ### main()
-if SnitVer ${WORLD}/elwix/elwix.ver; then
+if ! SnitVer ${WORLD}/elwix/elwix.ver; then
 	clean_bootstrap
 	compile_bootstrap
 else
 	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
 fi
 
-if SnitVer ${WORLD}/usr/local/elwix.ver; then
+if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
 	clean_tools
 	compile_fbsdtools
 	compile_tools