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.
This commit is contained in:
Peter Wemm 2001-01-22 23:29:13 +00:00
parent 1c3b5f2290
commit 6d84d742df

View File

@ -15,6 +15,7 @@
# -DNOLIBC_R do not build libc_r. # -DNOLIBC_R do not build libc_r.
# -DNO_FORTRAN do not build g77 and related libraries. # -DNO_FORTRAN do not build g77 and related libraries.
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -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_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_PORTSUPDATE do not update ports in ${MAKE} update
# -DNO_DOCUPDATE do not update doc in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update
@ -404,7 +405,7 @@ buildkernel:
PATH=${TMPPATH} \ PATH=${TMPPATH} \
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} ${_kernel} config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} ${_kernel}
.endif .endif
.if !defined(NOCLEAN) && defined(NO_KERNELDEPEND) .if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
cd ${KRNLOBJDIR}/${_kernel}; \ cd ${KRNLOBJDIR}/${_kernel}; \
${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} clean ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} clean
.endif .endif