From owner-svn-src-projects@FreeBSD.ORG  Mon May  5 18:17:26 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DA3B4377;
 Mon,  5 May 2014 18:17:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C80BCD2F;
 Mon,  5 May 2014 18:17:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s45IHQ7g027260;
 Mon, 5 May 2014 18:17:26 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s45IHQMB027259;
 Mon, 5 May 2014 18:17:26 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405051817.s45IHQMB027259@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Mon, 5 May 2014 18:17:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r265379 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 May 2014 18:17:26 -0000

Author: sjg
Date: Mon May  5 18:17:26 2014
New Revision: 265379
URL: http://svnweb.freebsd.org/changeset/base/265379

Log:
  If doing destroy-all and at top-level whack stage tree too.

Modified:
  projects/bmake/share/mk/bsd.obj.mk

Modified: projects/bmake/share/mk/bsd.obj.mk
==============================================================================
--- projects/bmake/share/mk/bsd.obj.mk	Mon May  5 18:16:15 2014	(r265378)
+++ projects/bmake/share/mk/bsd.obj.mk	Mon May  5 18:17:26 2014	(r265379)
@@ -153,21 +153,42 @@ cleandir: cleanobj
 _OBJDIR?= ${.OBJDIR}
 _CURDIR?= ${.CURDIR}
 
+# destroy almost everything
+destroy: destroy-all
+destroy-all:
+
+# just remove our objdir
 destroy-arch: .NOMETA
 .if ${_OBJDIR} != ${_CURDIR}
 	cd ${_CURDIR} && rm -rf ${_OBJDIR}
 .endif
 
-destroy: destroy-all
-destroy-all:
+.if defined(HOST_OBJTOP)
+destroy-host: destroy.host
+destroy.host: .NOMETA
+	cd ${_CURDIR} && rm -rf ${HOST_OBJTOP}/${RELDIR:N.}
+.endif
 
-.if ${_OBJDIR} != ${_CURDIR}
+.if make(destroy-all) && ${RELDIR} == "."
+destroy-all: destroy-stage
+.endif
+
+# remove the stage tree
+destroy-stage: .NOMETA
+.if defined(STAGE_ROOT)
+	cd ${_CURDIR} && rm -rf ${STAGE_ROOT}
+.endif
+
+# allow parallel destruction
 .for m in ${ALL_MACHINE_LIST}
 destroy-all: destroy.$m
+.if !target(destroy.$m)
 destroy.$m: .NOMETA
+.if ${_OBJDIR} != ${_CURDIR}
 	cd ${_CURDIR} && rm -rf ${OBJROOT}$m*/${RELDIR:N.}
-.endfor
 .endif
+.endif
+.endfor
 
 .endif