--- elwix/build_world.sh	2016/11/15 15:02:25	1.4.2.1
+++ elwix/build_world.sh	2021/09/08 12:07:28	1.7.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_world.sh,v 1.4.2.1 2016/11/15 15:02:25 misho Exp $
+# $Id: build_world.sh,v 1.7.2.1 2021/09/08 12:07:28 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -38,7 +38,7 @@ if [ "${USER}" != "root" ]; then
 fi
 
 # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
-X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
+[ -n "${TARGET_CPUTYPE}" ] && X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
 
 clean_world()
 {
@@ -95,6 +95,8 @@ install_world()
 	if [ $? -eq 0 ]; then
 		echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix.ver
 	fi
+
+	echo "+++ Completed ELWIX World ... $WORLD"
 }
 
 build_cross()
@@ -109,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
 
@@ -117,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}
@@ -125,17 +131,24 @@ _EOF
 	cat >>${CBUILD} <<_EOF
 make \$*
 _EOF
+	echo "+++ Ready cross script ${CBUILD}"
 	cat >>${CGBUILD} <<_EOF
 gmake \$*
 _EOF
+	echo "+++ Ready cross script ${CGBUILD}"
 	cat >>${CEXEC} <<_EOF
 eval \$*
 _EOF
+	echo "+++ Ready cross script ${CEXEC}"
 	chmod +x ${CBUILD} ${CGBUILD} ${CEXEC} ${CENV}
 	echo "Done."
 }
 
 ### main()
+if [ -n "${1}" ]; then
+	rm ${WORLD}/elwix.ver
+fi
+
 if ! SnitVer ${WORLD}/elwix.ver; then
 	if [ -z "$1" ]; then
 		clean_world