From 2cde9453827e0353739b831ec55cb39611367835 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Wed, 7 Oct 2009 02:26:12 +0200 Subject: [PATCH] Makefile.inc1: make sure that mtree is run for quickworld We need to run mtree in case new directories are added to the hierarchy in case these directories are also used during the build. --- Makefile.inc1 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9e5aed0374..00b163d320 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -298,7 +298,10 @@ KMAKEENV= ${WMAKEENV} # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -_worldtmp: +_worldtmp: _cleantmp _mtreetmp +.ORDER: _cleantmp _mtreetmp + +_cleantmp: @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -310,6 +313,8 @@ _worldtmp: rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif + +_mtreetmp: mkdir -p ${DESTDIRBASE} ${BTOOLSDEST} ${CTOOLSDEST} ${WORLDDEST} .for _dir in ${WORLDDEST} ${BTOOLSDEST} ${CTOOLSDEST} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ @@ -398,14 +403,15 @@ WMAKE_TGTS+= _includes _libraries _depend everything buildworld: ${WMAKE_TGTS} -quickworld: _obj _includes _libraries _depend everything +quickworld: _mtreetmp _obj _includes _libraries _depend everything -realquickworld: _obj _includes _libraries everything +realquickworld: _mtreetmp _obj _includes _libraries everything crossworld: _worldtmp _bootstrap-tools _obj _build-tools _cross-tools .ORDER: ${WMAKE_TGTS} .ORDER: _obj _includes +.ORDER: _mtreetmp _obj # # installcheck -- 2.41.0