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
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=34688

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