diff options
| author | bde <bde@FreeBSD.org> | 1998-03-19 16:43:19 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-03-19 16:43:19 +0000 |
| commit | dc6385f63348ec0e9e8f865c113ca25fc868ad5a (patch) | |
| tree | b6a3d75131fc3ec62fb6bf0fbb0894a4185e8b83 /Makefile | |
| parent | 7f952483d1d7142faef81ea502952b92b4934fce (diff) | |
| download | FreeBSD-src-dc6385f63348ec0e9e8f865c113ca25fc868ad5a.zip FreeBSD-src-dc6385f63348ec0e9e8f865c113ca25fc868ad5a.tar.gz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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 \ |
