--- elwix/build_world.sh	2017/02/13 16:52:46	1.5
+++ elwix/build_world.sh	2021/07/16 18:35:50	1.7
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_world.sh,v 1.5 2017/02/13 16:52:46 misho Exp $
+# $Id: build_world.sh,v 1.7 2021/07/16 18:35:50 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -111,7 +111,7 @@ build_cross()
 export \\
 _EOF
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
-		buildenvvars >> ${CENV}
+		WORLDTMP=${WORLD} 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
 
@@ -119,6 +119,10 @@ if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then
 	MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"
 fi
 
+export CROSS_WORLD=$WORLD
+export CFLAGS="\$CFLAGS -I\${CROSS_WORLD}/usr/include"
+export LDFLAGS="\$LDFLAGS -L\${CROSS_WORLD}/lib -L\${CROSS_WORLD}/usr/lib"
+
 _EOF
 	cd -
 	cp ${CENV} ${CBUILD}
@@ -141,6 +145,10 @@ _EOF
 }
 
 ### main()
+if [ -n "${1}" ]; then
+	rm ${WORLD}/elwix.ver
+fi
+
 if ! SnitVer ${WORLD}/elwix.ver; then
 	if [ -z "$1" ]; then
 		clean_world