From f649ab27a3876910078213430af38ef0bce98c5a Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 11 Nov 2017 01:10:08 +0000
Subject: [PATCH] cleanworld only needs a tree walk if the expected .OBJDIR is
 .CURDIR.

Sponsored by:	Dell EMC Isilon
---
 Makefile.inc1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8bc825d4606b..cc1c4832b403 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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