--- elwix/build_world.sh	2017/10/08 10:23:40	1.5.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.5.2.1 2017/10/08 10:23:40 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()
 {
@@ -111,13 +111,17 @@ 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
 
 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 -