Undo part of the last commit. OBJFORMAT_PATH controls how the cross
[dragonfly.git] / Makefile.inc1
index 3d0e250..ef1155b 100644 (file)
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.21 2004/03/20 16:27:39 drhodus Exp $
+# $DragonFly: src/Makefile.inc1,v 1.22 2004/03/21 03:48:38 dillon Exp $
 #
 # Make command line options:
 #      -DMAKE_KERBEROS5 to build Kerberos5
@@ -178,6 +178,7 @@ INSTALLTMP= ${TMPDIR}/install.${TMPPID}
 CROSSENV=      MAKEOBJDIRPREFIX=${OBJTREE} \
                MACHINE_ARCH=${TARGET_ARCH} \
                MACHINE=${TARGET} \
+               OBJFORMAT_PATH=${WORLDTMP} \
                PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503 \
                GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
                GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
@@ -213,7 +214,8 @@ IMAKEENV=   ${CROSSENV} \
 IMAKE=         ${IMAKEENV} ${MAKE} -f Makefile.inc1
 
 # kernel stage
-KMAKEENV=      ${WMAKEENV}
+KMAKEENV=      ${WMAKEENV} \
+               OBJFORMAT_PATH=${WORLDTMP}:${OBJFORMAT_PATH}
 
 # /usr/bin/gccX                        version-specific gcc binaries
 # /usr/lib/gccX                        version-specific gcc libraries