From owner-svn-src-projects@FreeBSD.ORG  Fri May 16 15:01:39 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 E31DF14C;
 Fri, 16 May 2014 15:01:39 +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 CEC1D286C;
 Fri, 16 May 2014 15:01:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GF1duF087380;
 Fri, 16 May 2014 15:01:39 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GF1dRl087378;
 Fri, 16 May 2014 15:01:39 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405161501.s4GF1dRl087378@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 16 May 2014 15:01:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r266236 - projects/bmake/lib/clang
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 15:01:40 -0000

Author: sjg
Date: Fri May 16 15:01:39 2014
New Revision: 266236
URL: http://svnweb.freebsd.org/changeset/base/266236

Log:
  Handle bootstrapping for host

Modified:
  projects/bmake/lib/clang/clang.build.mk

Modified: projects/bmake/lib/clang/clang.build.mk
==============================================================================
--- projects/bmake/lib/clang/clang.build.mk	Fri May 16 15:00:30 2014	(r266235)
+++ projects/bmake/lib/clang/clang.build.mk	Fri May 16 15:01:39 2014	(r266236)
@@ -40,9 +40,18 @@ CXXFLAGS+=	-fno-exceptions -fno-rtti
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
+.if ${MACHINE} == "host" && defined(EARLY_BUILD)
+.if !empty(LEGACY_TOOLS) && exists(${LEGACY_TOOLS}/usr/bin/tblgen)
+TOOLSDIR= ${LEGACY_TOOLS}
+.endif
+.endif
 .if ${MK_STAGING} == "yes"
-TBLGEN= ${STAGE_HOST_OBJTOP}/usr/bin/tblgen
-CLANG_TBLGEN= ${STAGE_HOST_OBJTOP}/usr/bin/clang-tblgen
+TOOLSDIR?= ${STAGE_HOST_OBJTOP}
+.endif
+TOOLSDIR?=
+.if !empty(TOOLSDIR)
+TBLGEN= ${TOOLSDIR}/usr/bin/tblgen
+CLANG_TBLGEN= ${TOOLSDIR}/usr/bin/clang-tblgen
 .endif
 TBLGEN?=	tblgen
 CLANG_TBLGEN?=	clang-tblgen