svn commit: r359089 - head

[Ed Maste]

Author: emaste
Date: Wed Mar 18 21:20:10 2020
New Revision: 359089
URL: https://svnweb.freebsd.org/changeset/base/359089

Log:
  Revert r359083, fixed properly by r359088
  
  r359083 introduced a workaround for stale libomp dependencies during a
  regular (no -DNO_CLEAN) buildworld.  r359088 addressed the reason the
  clean step missed libomp, so revert the workaround.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Mar 18 21:15:45 2020	(r359088)
+++ head/Makefile.inc1	Wed Mar 18 21:20:10 2020	(r359089)
@@ -1082,10 +1082,9 @@ _cleanobj:
 .if defined(_LIBCOMPAT)
 	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} _NO_INCLUDE_COMPILERMK=t -f Makefile.inc1 ${CLEANDIR}
 .endif
-.endif	# !defined(NO_CLEAN)
-	# XXX make cleandir left stale .depend files behind, so invoke the
-	# dependency cleanup hack unconditionally.
+.else
 	${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
+.endif	# !defined(NO_CLEAN)
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"