From owner-svn-src-all@FreeBSD.ORG  Thu Nov 10 20:15:35 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7C43106564A;
	Thu, 10 Nov 2011 20:15:35 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9EEE18FC14;
	Thu, 10 Nov 2011 20:15:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAAKFZ4F054601;
	Thu, 10 Nov 2011 20:15:35 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAAKFZ0k054599;
	Thu, 10 Nov 2011 20:15:35 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201111102015.pAAKFZ0k054599@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 10 Nov 2011 20:15:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227427 - head
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Nov 2011 20:15:35 -0000

Author: dim
Date: Thu Nov 10 20:15:35 2011
New Revision: 227427
URL: http://svn.freebsd.org/changeset/base/227427

Log:
  Revert r227403 for now.  Since the cross-tools stage purposefully
  doesn't have ${WORLDTMP}/usr/bin in its PATH, if you build world with
  CC=clang, tblgen tools from /usr/bin will be used instead of the ones
  built under ${WORLDTMP}.  This can lead to various errors, especially if
  you upgrade from an older clang.
  
  Note that building world with gcc would not experience these problems,
  because it only uses the tblgen tools in the world stage, where PATH
  does contain ${WORLDTMP}/usr/bin.
  
  Pointy hat to:	dim

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Nov 10 19:54:00 2011	(r227426)
+++ head/Makefile.inc1	Thu Nov 10 20:15:35 2011	(r227427)
@@ -1029,6 +1029,14 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptre
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
+.if ${MK_CLANG} != "no"
+_clang_tblgen= \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmtablegen \
+	usr.bin/clang/tblgen \
+	usr.bin/clang/clang-tblgen
+.endif
+
 .if ${MK_CDDL} != "no" && \
     ${BOOTSTRAPPING} < 800038 && \
     !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)
@@ -1045,6 +1053,7 @@ _dtc= gnu/usr.bin/dtc
 #	FreeBSD versions that need the tool built at this stage of the build.
 bootstrap-tools:
 .for _tool in \
+    ${_clang_tblgen} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
@@ -1140,13 +1149,9 @@ _binutils=	gnu/usr.bin/binutils
 .endif
 
 .if ${MK_CLANG} != "no"
-_clang_tblgen=	lib/clang/libllvmsupport \
-		lib/clang/libllvmtablegen \
-		usr.bin/clang/tblgen \
-		usr.bin/clang/clang-tblgen
 .if ${CC:T:Mclang} == "clang"
-_clang_libs=	lib/clang
 _clang=		usr.bin/clang
+_clang_libs=	lib/clang
 .endif
 .endif
 
@@ -1156,7 +1161,6 @@ _cc=		gnu/usr.bin/cc
 
 cross-tools:
 .for _tool in \
-    ${_clang_tblgen} \
     ${_clang_libs} \
     ${_clang} \
     ${_binutils} \