From bd808d4133ceb9998335d692603315f8a2152af2 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 6 Nov 2014 17:19:41 +0000 Subject: [PATCH] Ignore errors from rm -rf to support high -j builds. This is, at best, a kludge. However, it also effectively works around the issues for high -j builds on systems that do not have the rm fixes. A better fix would be to rmdir here, and fix the places where we're sloppy and not list all the files we create in CLEANFILES, should anybody have the time to chase them all to ground. --- share/mk/bsd.obj.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 95122e8ea01b..a0be223a344f 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -112,7 +112,7 @@ whereobj: .if ${CANONICALOBJDIR} != ${.CURDIR} && exists(${CANONICALOBJDIR}/) cleanobj: - @rm -rf ${CANONICALOBJDIR} + @-rm -rf ${CANONICALOBJDIR} .else cleanobj: clean cleandepend .endif @@ -130,7 +130,7 @@ clean: rm -f ${CLEANFILES} .endif .if defined(CLEANDIRS) && !empty(CLEANDIRS) - rm -rf ${CLEANDIRS} + -rm -rf ${CLEANDIRS} .endif .endif