From 0d02682c96b730dd690d5be09dc0952c2b8b22e4 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 18 Mar 2020 20:12:46 +0000
Subject: [PATCH] invoke _cleanobj_fast_depend_hack unconditionally

Apparently make ${CLEANDIR} is leaving stale entries in .depend files;
for now invoke the hacky cleanup in both the -DNO_CLEAN and normal
(no -DNO_CLEAN) cases.

In collaboration with:	dim
Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 08eaa8999c0..cd2d9a6bf7f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1082,9 +1082,10 @@ _cleanobj:
 .if defined(_LIBCOMPAT)
 	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} _NO_INCLUDE_COMPILERMK=t -f Makefile.inc1 ${CLEANDIR}
 .endif
-.else
-	${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
 .endif	# !defined(NO_CLEAN)
+	# XXX make cleandir left stale .depend files behind, so invoke the
+	# dependency cleanup hack unconditionally.
+	${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"
-- 
2.45.0