From owner-svn-src-head@FreeBSD.ORG  Sun Apr 13 05:21:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 41EFC4CA;
 Sun, 13 Apr 2014 05:21:23 +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 304741792;
 Sun, 13 Apr 2014 05:21:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3D5LN6J052404;
 Sun, 13 Apr 2014 05:21:23 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3D5LNCg052403;
 Sun, 13 Apr 2014 05:21:23 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404130521.s3D5LNCg052403@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 13 Apr 2014 05:21:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264395 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Apr 2014 05:21:23 -0000

Author: imp
Date: Sun Apr 13 05:21:22 2014
New Revision: 264395
URL: http://svnweb.freebsd.org/changeset/base/264395

Log:
  Determine whether to build clang and its bootstrap tools the same
  way. This allows a clang bootstrap to happen, even when WITHOUT_CLANG
  is defined. This is a minimal version of a more extensive change which
  can be MFC'd more easily. However, we have to also test to see if
  we're building clang as not cc, since the bootstrap for that needs
  these cross tools and it is easier to build them in just one place.
  
  MFC after: 1 week

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Apr 13 02:03:14 2014	(r264394)
+++ head/Makefile.inc1	Sun Apr 13 05:21:22 2014	(r264395)
@@ -1234,7 +1234,7 @@ _awk=		usr.bin/awk
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
-.if ${MK_CLANG} != "no"
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" || ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \