Index: Makefile.inc1
===================================================================
RCS file: /cvs/freebsd/src/Makefile.inc1,v
retrieving revision 1.206
diff -u -r1.206 Makefile.inc1
--- Makefile.inc1	2001/07/09 17:49:34	1.206
+++ Makefile.inc1	2001/07/13 19:51:10
@@ -130,7 +130,7 @@
 WORLDTMP=	${OBJTREE}${.CURDIR}/${BUILD_ARCH}
 # /usr/games added for fortune which depend on strfile
 STRICTTMPPATH=	${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
-TMPPATH=	${STRICTTMPPATH}:${PATH}
+TMPPATH=	${STRICTTMPPATH}:${WORLDTMP}${.CURDIR}/gnu/usr.bin/cc/cc_tools:${WORLDTMP}${.CURDIR}/gnu/usr.bin/cc/f771:${PATH}
 OBJFORMAT_PATH?=	/usr/libexec
 
 TMPDIR?=	/tmp
@@ -185,13 +185,14 @@
 # build-tool stage
 TMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		MACHINE_ARCH=${BUILD_ARCH} \
 		PATH=${TMPPATH}
 TMAKE=		${TMAKEENV} ${MAKE} -f Makefile.inc1
 
 # cross-tool stage
 XMAKEENV=	${BOOTSTRAPENV} \
 		TARGET_ARCH=${MACHINE_ARCH}
-XMAKE=		${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNO_FORTRAN -DNO_GDB \
+XMAKE=		${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNO_GDB \
 			-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE \
 			-DNOSHARED
 
@@ -272,12 +273,15 @@
 	@echo ">>> stage 2: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${TMAKE} ${CLEANDIR:S/^/par-/}
+.if ${MACHINE_ARCH} != ${BUILD_ARCH}
+	cd ${.CURDIR}; ${XMAKE} ${CLEANDIR:S/^/par-/}
+.endif
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${TMAKE} par-obj
+	cd ${.CURDIR}; ${WMAKE} par-obj
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2: build tools"
@@ -584,10 +588,6 @@
 _share=	share/syscons/scrnmaps
 .endif
 
-.if !defined(NO_FORTRAN)
-_fortran= gnu/usr.bin/cc/f771
-.endif
-
 .if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
     !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
 _libroken4= kerberosIV/lib/libroken
@@ -599,7 +599,7 @@
 .endif
 
 build-tools:
-.for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
+.for _tool in bin/csh bin/sh ${_games} \
     ${_libroken4} ${_libkrb5} lib/libncurses ${_share} usr.sbin/sysinstall
 	cd ${.CURDIR}/${_tool}; ${MAKE} build-tools
 .endfor
@@ -630,7 +630,14 @@
 _perl=	gnu/usr.bin/perl/libperl gnu/usr.bin/perl/miniperl
 .endif
 
+.if !defined(NO_FORTRAN)
+_fortran= gnu/usr.bin/cc/f771
+.endif
+
 cross-tools:
+.for _tool in gnu/usr.bin/cc/cc_tools ${_fortran}
+	cd ${.CURDIR}/${_tool}; ${MAKE} obj; ${MAKE} build-tools
+.endfor
 .for _tool in ${_btxld} ${_elf2exe} ${_perl} \
     gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc
 	cd ${.CURDIR}/${_tool}; \
Index: gnu/usr.bin/cc/cc_tools/Makefile
===================================================================
RCS file: /cvs/freebsd/src/gnu/usr.bin/cc/cc_tools/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- gnu/usr.bin/cc/cc_tools/Makefile	2001/03/02 03:00:41	1.51
+++ gnu/usr.bin/cc/cc_tools/Makefile	2001/07/13 19:51:10
@@ -22,13 +22,13 @@
 
 .for F in attr codes config flags
 insn-$F.h: gen$F ${MD_FILE}
-	./gen$F ${MD_FILE} > insn-$F.h
+	PATH=${PATH}:. gen$F ${MD_FILE} > insn-$F.h
 GENSRCS+=	insn-$F.h
 .endfor
 
 .for F in attrtab emit extract opinit output peep recog
 insn-$F.c: gen$F ${MD_FILE}
-	./gen$F ${MD_FILE} > insn-$F.c
+	PATH=${PATH}:. gen$F ${MD_FILE} > insn-$F.c
 GENSRCS+=	insn-$F.c
 .endfor
 
@@ -66,7 +66,7 @@
 
 .ORDER: genrtl.c genrtl.h
 genrtl.c genrtl.h: gengenrtl
-	./gengenrtl genrtl.h genrtl.c
+	PATH=${PATH}:. gengenrtl genrtl.h genrtl.c
 
 GENSRCS+=	genrtl.c genrtl.h
 
@@ -93,7 +93,7 @@
 # Common parser stuff.
 
 tree-check.h: gencheck
-	./gencheck > ${.TARGET}
+	PATH=${PATH}:. gencheck > ${.TARGET}
 GENSRCS+=	tree-check.h
 
 #-----------------------------------------------------------------------
Index: gnu/usr.bin/cc/f771/Makefile
===================================================================
RCS file: /cvs/freebsd/src/gnu/usr.bin/cc/f771/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- gnu/usr.bin/cc/f771/Makefile	2000/03/15 05:13:53	1.6
+++ gnu/usr.bin/cc/f771/Makefile	2001/07/13 19:51:10
@@ -35,7 +35,7 @@
 .for i in 1t 2t fo io nq op ot
 .ORDER: str-$i.h str-$i.j
 str-$i.j str-$i.h: str-$i.fin fini
-	./fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h
+	PATH=${PATH}:. fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h
 
 FINIHDRS+=	str-$i.j str-$i.h
 .endfor