d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r227403 for now. Since the cross-tools stage purposefully

Browse Source 
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
This commit is contained in:
Dimitry Andric 2011-11-10 20:15:35 +00:00
parent 965aab1233
commit 907eed1f50
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.inc1
View File

@ -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} \