diff options
| author | dim <dim@FreeBSD.org> | 2011-11-10 20:15:35 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-11-10 20:15:35 +0000 |
| commit | b920116b3673773e5155e62548e2b97c3a5d3e65 (patch) | |
| tree | dc5a3d0f04b17a939248e59384fc22396fbf56d6 /Makefile.inc1 | |
| parent | 2429243a4a0b3924405813ca35197eccf7b557b0 (diff) | |
| download | FreeBSD-src-b920116b3673773e5155e62548e2b97c3a5d3e65.zip FreeBSD-src-b920116b3673773e5155e62548e2b97c3a5d3e65.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ffbaa28..2f4f84c 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} \ |
