summaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2020-03-18 21:20:10 +0000
committerEd Maste <emaste@FreeBSD.org>2020-03-18 21:20:10 +0000
commitdadc342d071c57ee67a1867afac5b73c8094ef8c (patch)
tree553c7be8585cdb168d04265550780313517e20be /Makefile.inc1
parentd64b2df9326e6415d57c23d2997a4e2b00d681cf (diff)
downloadsrc-test2-dadc342d071c57ee67a1867afac5b73c8094ef8c.tar.gz
src-test2-dadc342d071c57ee67a1867afac5b73c8094ef8c.zip
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
Notes
Notes: svn path=/head/; revision=359089
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc15
1 files 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 "--------------------------------------------------------------"