d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous commit, and

Browse Source 
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.
This commit is contained in:
Marcel Moolenaar 1999-12-23 11:25:34 +00:00
parent e202332cc4
commit 3eafbc1a3a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55025
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.inc1
View File

@ -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; \