From owner-svn-src-all@FreeBSD.ORG  Thu Sep 18 01:57:36 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C6495D2D;
 Thu, 18 Sep 2014 01:57:36 +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 B23B6841;
 Thu, 18 Sep 2014 01:57:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8I1vav6012060;
 Thu, 18 Sep 2014 01:57:36 GMT (envelope-from will@FreeBSD.org)
Received: (from will@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8I1vatC012059;
 Thu, 18 Sep 2014 01:57:36 GMT (envelope-from will@FreeBSD.org)
Message-Id: <201409180157.s8I1vatC012059@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: will set sender to will@FreeBSD.org
 using -f
From: Will Andrews <will@FreeBSD.org>
Date: Thu, 18 Sep 2014 01:57:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271730 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2014 01:57:36 -0000

Author: will
Date: Thu Sep 18 01:57:36 2014
New Revision: 271730
URL: http://svnweb.freebsd.org/changeset/base/271730

Log:
  Root the lib32 object tree under the overall object tree.
  
  This enables a common root directory for all object files for a given tree,
  which eases sharing a common MAKEOBJDIRPREFIX, and cleaning up of object trees.
  
  In particular, one can simply (from the source directory) rm -rf /usr/obj$(pwd)
  to destroy all object files for it.  Or to copy/sync files, etc.
  
  Reviewed by:	bdrewery
  CR:		https://reviews.freebsd.org/D796
  MFC after:	1 month
  Sponsored by:	Spectra Logic

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Sep 18 01:24:40 2014	(r271729)
+++ head/Makefile.inc1	Thu Sep 18 01:57:36 2014	(r271730)
@@ -352,6 +352,7 @@ WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAG
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
+LIB32_OBJTREE=	${OBJTREE}${.CURDIR}/world32
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
 .if ${TARGET_ARCH} == "amd64"
@@ -387,7 +388,7 @@ LIB32FLAGS+=		--sysroot=${WORLDTMP}
 .endif
 
 # Yes, the flags are redundant.
-LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
+LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
@@ -611,7 +612,7 @@ build32:
 	cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
+	    MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 	    build-tools
 .endfor