svn commit: r359083 - head

[Ed Maste]

Author: emaste
Date: Wed Mar 18 20:12:46 2020
New Revision: 359083
URL: https://svnweb.freebsd.org/changeset/base/359083

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Mar 18 18:26:53 2020	(r359082)
+++ head/Makefile.inc1	Wed Mar 18 20:12:46 2020	(r359083)
@@ -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 "--------------------------------------------------------------"