From owner-svn-src-projects@FreeBSD.ORG  Tue Aug 19 06:37:33 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 ABBFEE8F;
 Tue, 19 Aug 2014 06:37:33 +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 97EB435C8;
 Tue, 19 Aug 2014 06:37:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7J6bXLe050626;
 Tue, 19 Aug 2014 06:37:33 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7J6bXfJ050625;
 Tue, 19 Aug 2014 06:37:33 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201408190637.s7J6bXfJ050625@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Tue, 19 Aug 2014 06:37:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r270163 - 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-1
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: Tue, 19 Aug 2014 06:37:33 -0000

Author: sjg
Date: Tue Aug 19 06:37:33 2014
New Revision: 270163
URL: http://svnweb.freebsd.org/changeset/base/270163

Log:
  After we finish using src/Makefile.inc1 to bootstrap legacy tools
  use it to build the toolchain we actually want.

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

Modified: projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile
==============================================================================
--- projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile	Tue Aug 19 03:51:10 2014	(r270162)
+++ projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile	Tue Aug 19 06:37:33 2014	(r270163)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 # building clang is particularly tedious - so avoid re-inventing wheels
-# the end result is 
 
-all: cross-tools build-tools
+all: bootstrap-toolchain
 
 UPDATE_DEPENDFILE= no
 .export UPDATE_DEPENDFILE
@@ -28,6 +27,7 @@ BSARGS= \
 	SSP_CFLAGS= \
 	MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
 	-DNO_PIC MK_PROFILE=no -DNO_SHARED \
+	-DWITH_CLANG_BOOTSTRAP \
 	-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
 
 
@@ -45,3 +45,22 @@ cross-tools: build-tools
 cross-tools build-tools bootstrap-tools: .MAKE .META
 	${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
 	touch $@
+
+# MAKELEVEL=0 so that dirdeps.mk does its thing
+# LEGACY_TOOLS lets us use the bootstaped stuff above
+# TARGET* is so that MK_CLANG gets set correctly.
+BSTCENV= \
+	MAKELEVEL=0 \
+	MACHINE=host \
+	LEGACY_TOOLS=${LEGACY_TOOLS} \
+	TARGET=${HOST_MACHINE} \
+	TARGET_ARCH=${HOST_MACHINE_ARCH}
+
+BSTCARGS= \
+	${BSARGS} \
+	-DWITH_STAGING \
+	-DWITH_TOOLSDIR
+
+# finally we build toolchain leveraging the above.
+bootstrap-toolchain:	.MAKE cross-tools
+	${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS} toolchain