svn commit: r271730 - head

[Will Andrews]

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