From 3eafbc1a3af5224d0468dd723f53916fe607eca8 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 23 Dec 1999 11:25:34 +0000
Subject: [PATCH] Revert previous commit, and

o  Add genassym to the list of cross-tools
o  Remove sh hashing work-around, we don't need it anymore
o  Clean more directories in WORLDTMP when NOCLEAN is specified

The sh hashing work-around is not needed anymore, because we don't
trigger the bug anymore.

When NOCLEAN is not defined, we wipe out the complete WORLDTMP,
including the object directories of the tools we have built. When
NOCLEAN is defined, we remove anything that we install anyway, which
is usr/bin, usr/games, usr/include, usr/lib and usr/sbin.
---
 Makefile.inc1 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f94bcbc13e1f..bc210ce1780d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -115,7 +115,7 @@ OBJTREE=	${MAKEOBJDIRPREFIX}/${MACHINE_ARCH}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/${BUILD_ARCH}
 # /usr/games added for fortune which depend on strfile and caesar.
-STRICTTMPPATH=	${WORLDTMP}/sbin:${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+STRICTTMPPATH=	${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
 #
@@ -203,7 +203,9 @@ buildworld:
 .if !defined(NOCLEAN)
 	rm -rf ${WORLDTMP}
 .else
-	rm -rf ${WORLDTMP}/usr/bin
+	for dir in bin games include lib sbin; do \
+		rm -rf ${WORLDTMP}/usr/$$dir; \
+	done
 	rm -f ${WORLDTMP}/sys
 .endif
 .for _dir in ${USRDIRS}
@@ -218,10 +220,6 @@ buildworld:
 	@echo ">>> stage 1: bootstrap tools"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${BMAKE} bootstrap-tools
-.if !empty(.MAKEFLAGS:M-j)
-	# Work-around for broken sh(1) hashing.
-	-hash -r
-.endif
 .if !defined(NOCLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -444,7 +442,7 @@ _aout_tools=	usr.bin/size usr.bin/strip gnu/usr.bin/as gnu/usr.bin/ld
 .endif
 
 cross-tools:
-.for _tool in ${_aout_tools} ${_elf2exe} usr.bin/gensetdefs \
+.for _tool in ${_aout_tools} ${_elf2exe} usr.bin/genassym usr.bin/gensetdefs \
     gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc
 	cd ${.CURDIR}/${_tool}; \
 		${MAKE} obj; \