@@ -4,26 +4,14 @@ set -ex
44
55source shared.sh
66
7- # Currently these commits are all tip-of-tree as of 2018-12-16, used to pick up
8- # a fix for rust-lang/rust#56849
9- LLVM=032b00a5404865765cda7db3039f39d54964d8b0
10- LLD=3e4aa4e8671523321af51449e0569f455ef3ad43
11- CLANG=a6b9739069763243020f4ea6fe586bc135fde1f9
7+ LLVM=llvmorg-8.0.0-rc2
128
13- mkdir clang
14- cd clang
9+ mkdir llvm-project
10+ cd llvm-project
1511
16- curl -L https://github.com/llvm-mirror /llvm/archive/$LLVM .tar.gz | \
12+ curl -L https://github.com/llvm/llvm-project /archive/$LLVM .tar.gz | \
1713 tar xzf - --strip-components=1
1814
19- mkdir -p tools/clang
20- curl -L https://github.com/llvm-mirror/clang/archive/$CLANG .tar.gz | \
21- tar xzf - --strip-components=1 -C tools/clang
22-
23- mkdir -p tools/lld
24- curl -L https://github.com/llvm-mirror/lld/archive/$LLD .tar.gz | \
25- tar zxf - --strip-components=1 -C tools/lld
26-
2715mkdir clang-build
2816cd clang-build
2917
@@ -39,20 +27,21 @@ cd clang-build
3927#
4028# [1]: https://sourceware.org/ml/crossgcc/2008-11/msg00028.html
4129INC=" /rustroot/include"
42- INC=" $INC :/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5 /include-fixed"
30+ INC=" $INC :/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0 /include-fixed"
4331INC=" $INC :/usr/include"
4432
4533hide_output \
46- cmake .. \
34+ cmake ../llvm \
4735 -DCMAKE_C_COMPILER=/rustroot/bin/gcc \
4836 -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ \
4937 -DCMAKE_BUILD_TYPE=Release \
5038 -DCMAKE_INSTALL_PREFIX=/rustroot \
5139 -DLLVM_TARGETS_TO_BUILD=X86 \
40+ -DLLVM_ENABLE_PROJECTS=" clang;lld" \
5241 -DC_INCLUDE_DIRS=" $INC "
5342
5443hide_output make -j10
5544hide_output make install
5645
5746cd ../..
58- rm -rf clang
47+ rm -rf llvm-project
0 commit comments