From ddd945c7b5b0d0d0641cb568abbe6e84ece1ec17 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 9 Nov 2015 23:36:57 +0000
Subject: [PATCH] Fix 'make cleanworld' to respect TARGET/TARGET_ARCH for
 cross-build objtrees.

This simplifies the logic to always try removing the objdir if it exists
and to fallback on a 'cleandir' if no objdir exists.  The reasoning for
this is to avoid rm -rf src/* (r126024)

Sponsored by:	EMC / Isilon Storage Division
MFC after:	2 weeks
---
 Makefile.inc1 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index d6942f0822f2..50a0f8ba5c8a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2219,20 +2219,16 @@ builddtb:
 # created by bsd.obj.mk, except that we don't want to .include that file
 # in this makefile.
 #
-BW_CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
+BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR}
 cleanworld: .PHONY
-.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 .if exists(${BW_CANONICALOBJDIR}/)
 	-rm -rf ${BW_CANONICALOBJDIR}/*
 	-chflags -R 0 ${BW_CANONICALOBJDIR}
 	rm -rf ${BW_CANONICALOBJDIR}/*
 .endif
+.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${MAKE} cleandir
-.else
-	-rm -rf ${.OBJDIR}/*
-	-chflags -R 0 ${.OBJDIR}
-	rm -rf ${.OBJDIR}/*
 .endif
 
 .if defined(TARGET) && defined(TARGET_ARCH)