From 592ce487e7c1cf17ad9d08c8c86ecbd88634e398 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 21 Mar 2004 03:48:38 +0000 Subject: [PATCH] Undo part of the last commit. OBJFORMAT_PATH controls how the cross compiler is exec'd, it is necessary for buildworld to find the correct compiler and include file base directory. --- Makefile.inc1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3d0e2508cf..ef1155b60a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 -- 2.41.0