From owner-svn-src-projects@FreeBSD.ORG  Fri May 16 14:54:05 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 B2E13A48;
 Fri, 16 May 2014 14:54:05 +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 A0B952792;
 Fri, 16 May 2014 14:54:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GEs5JN082954;
 Fri, 16 May 2014 14:54:05 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GEs50e082953;
 Fri, 16 May 2014 14:54:05 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405161454.s4GEs50e082953@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 16 May 2014 14:54:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r266230 - projects/bmake/pkgs/pseudo/bootstrap-tools
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: Fri, 16 May 2014 14:54:05 -0000

Author: sjg
Date: Fri May 16 14:54:05 2014
New Revision: 266230
URL: http://svnweb.freebsd.org/changeset/base/266230

Log:
  Use BTOOLSDIR

Modified:
  projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile

Modified: projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile
==============================================================================
--- projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile	Fri May 16 14:53:15 2014	(r266229)
+++ projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile	Fri May 16 14:54:05 2014	(r266230)
@@ -6,21 +6,22 @@
 all: cross-tools build-tools
 
 UPDATE_DEPENDFILE= no
+.export UPDATE_DEPENDFILE
 
 # we build for the pseudo machine "host"
 TARGET_MACHINE= host
 
 HOST_MACHINE!= uname -m
 HOST_MACHINE_ARCH!= uname -p
-TOOLSDIR?= ${HOST_OBJTOP}/tools
-LEGACY_TOOLS?= ${TOOLSDIR}/legacy
+BTOOLSDIR?= ${HOST_OBJTOP}/tools
+LEGACY_TOOLS?= ${BTOOLSDIR}/legacy
 
 BSENV= \
-	unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${TOOLSDIR} \
-        MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
-        TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
-        WITHOUT_STAGING=1 STAGE_ROOT= \
-        WORLDTMP=${TOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS}
+	unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${BTOOLSDIR} \
+	MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
+	TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
+	WITHOUT_STAGING=1 STAGE_ROOT= \
+	WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS}
 
 BSARGS= \
 	DESTDIR= \
@@ -32,7 +33,7 @@ BSARGS= \
 
 legacy: .MAKE .META
 	mkdir -p ${LEGACY_TOOLS}
-	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${TOOLSDIR} > $@2
+	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${BTOOLSDIR} > $@2
 	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${LEGACY_TOOLS} > $@
 	${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
 	touch $@