Build the initial `make' in the temporary build tree so that its forced

cleaning doesn't affect the normal copy.  Save a little time by not doing
unnecessary clean, depend nd cleandepend steps.

Reviewed by:	mckay@freebsd.org

Added xargs to build-tools.  It may be used for kdump and truss.
This commit is contained in:
Bruce Evans 1998-03-19 16:43:19 +00:00
parent d767c61bfd
commit 47e0b716cb

View File

@ -1,5 +1,5 @@
#
# $Id: Makefile,v 1.165 1998/03/15 04:52:58 bde Exp $
# $Id: Makefile,v 1.166 1998/03/16 11:58:46 bde Exp $
#
# While porting to the another architecture include the bootstrap instead
# of the normal build.
@ -208,7 +208,8 @@ XMAKEENV= PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
CC='cc -nostdinc' # XXX -nostdlib
# used to compile and install 'make' in temporary build tree
IBMAKE= ${BMAKEENV} ${MAKE} DESTDIR=${WORLDTMP}
MAKETMP= ${WORLDTMP}/make
IBMAKE= ${BMAKEENV} MAKEOBJDIR=${MAKETMP} ${MAKE} DESTDIR=${WORLDTMP}
# bootstrap make
BMAKE= ${BMAKEENV} ${WORLDTMP}/usr/bin/${MAKE} DESTDIR=${WORLDTMP}
# cross make used for compilation
@ -237,16 +238,14 @@ buildworld:
@echo "--------------------------------------------------------------"
@echo " Making make"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}/usr/bin
.if !defined(NOCLEAN) || !defined(NOOBJDIR)
mkdir -p ${WORLDTMP}/usr/bin ${MAKETMP}
( \
cd ${.CURDIR}/usr.bin/make && \
${IBMAKE} -I${.CURDIR}/share/mk ${CLEANDIR} ${OBJDIR}
.endif
cd ${.CURDIR}/usr.bin/make && \
${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} depend && \
MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} all && \
${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} install && \
${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} clean cleandepend
${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} clean \
)
.endif
@echo
@echo "--------------------------------------------------------------"
@ -698,6 +697,7 @@ build-tools:
usr.bin/vgrind \
usr.bin/vi \
usr.bin/wc \
usr.bin/xargs \
usr.bin/yacc \
usr.sbin/chown \
usr.sbin/mtree \