From aa9ceac49d14538e320c514084d971dc61828f0c Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 20 Mar 2018 18:02:21 +0000 Subject: [PATCH] Remove stale generated assym.s files after r331254 So that -DNO_CLEAN builds work. This should be reverted after a sufficient transition period (perhaps 3 or 6 months). Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 09018e048694..1047d81ac44e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1394,6 +1394,14 @@ INSTALLKERNEL= ${_kernel} .endif .endfor +_cleankernobj_fast_depend_hack: .PHONY +# 20170202 remove stale generated assym.s after renaming to .inc in r331254 +.if exists(${OBJTOP}/sys/${KERNCONF}/assym.s) + @echo Removing stale generated assym files + @rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \ + ${OBJTOP}/sys/${KERNCONF}/.depend.assym.* +.endif + ${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY # @@ -1429,6 +1437,8 @@ buildkernel: .MAKE .PHONY @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} +.else + ${_+_}cd ${.CURDIR}; ${WMAKE} _cleankernobj_fast_depend_hack .endif .if !defined(NO_KERNELOBJ) @echo