svn commit: r325695 - head
Bryan Drewery
bdrewery at FreeBSD.org
Sat Nov 11 01:10:09 UTC 2017
Author: bdrewery
Date: Sat Nov 11 01:10:08 2017
New Revision: 325695
URL: https://svnweb.freebsd.org/changeset/base/325695
Log:
cleanworld only needs a tree walk if the expected .OBJDIR is .CURDIR.
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Nov 10 23:54:58 2017 (r325694)
+++ head/Makefile.inc1 Sat Nov 11 01:10:08 2017 (r325695)
@@ -2814,7 +2814,8 @@ cleanworld cleanuniverse: .PHONY
-chflags -R 0 ${BW_CANONICALOBJDIR}
rm -rf ${BW_CANONICALOBJDIR}*
.endif
-.if make(cleanworld) && ${MK_AUTO_OBJ} == "no"
+.if make(cleanworld) && ${MK_AUTO_OBJ} == "no" && \
+ (empty(BW_CANONICALOBJDIR) || ${.CURDIR:tA} == ${BW_CANONICALOBJDIR:tA})
.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
# To be safe in this case, fall back to a 'make cleandir'
${_+_}@cd ${.CURDIR}; ${MAKE} cleandir
More information about the svn-src-all
mailing list