From 907eed1f5019c26fc840b2da222f9643a7740a60 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 10 Nov 2011 20:15:35 +0000
Subject: [PATCH] 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
---
 Makefile.inc1 | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index ffbaa28d3ec7..2f4f84c683d8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1029,6 +1029,14 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 _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} \