From 6d84d742df9924d001160a5c1e2b2b5ea628ad5d Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 22 Jan 2001 23:29:13 +0000 Subject: [PATCH] Sigh, I thought we still had the rm -rf objdir stuff in make world, which would have taken care of the possibility of buildkernel crossing over from one binutils set to another. Back out the part about turning off 'make clean' if the 'make depend' is still active, but add a NO_KERNELCLEAN target instead that works like NOCLEAN but just for the kernel. --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 4fce5edd8ca1..1b13707fef7e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -15,6 +15,7 @@ # -DNOLIBC_R do not build libc_r. # -DNO_FORTRAN do not build g77 and related libraries. # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel +# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update @@ -404,7 +405,7 @@ buildkernel: PATH=${TMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} ${_kernel} .endif -.if !defined(NOCLEAN) && defined(NO_KERNELDEPEND) +.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} clean .endif