From dadc342d071c57ee67a1867afac5b73c8094ef8c Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Wed, 18 Mar 2020 21:20:10 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cd2d9a6bf7f5..08eaa8999c09 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 "--------------------------------------------------------------"