@@ -4,26 +4,14 @@ set -ex
4
4
5
5
source shared.sh
6
6
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
12
8
13
- mkdir clang
14
- cd clang
9
+ mkdir llvm-project
10
+ cd llvm-project
15
11
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 | \
17
13
tar xzf - --strip-components=1
18
14
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
-
27
15
mkdir clang-build
28
16
cd clang-build
29
17
@@ -39,20 +27,21 @@ cd clang-build
39
27
#
40
28
# [1]: https://sourceware.org/ml/crossgcc/2008-11/msg00028.html
41
29
INC=" /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"
43
31
INC=" $INC :/usr/include"
44
32
45
33
hide_output \
46
- cmake .. \
34
+ cmake ../llvm \
47
35
-DCMAKE_C_COMPILER=/rustroot/bin/gcc \
48
36
-DCMAKE_CXX_COMPILER=/rustroot/bin/g++ \
49
37
-DCMAKE_BUILD_TYPE=Release \
50
38
-DCMAKE_INSTALL_PREFIX=/rustroot \
51
39
-DLLVM_TARGETS_TO_BUILD=X86 \
40
+ -DLLVM_ENABLE_PROJECTS=" clang;lld" \
52
41
-DC_INCLUDE_DIRS=" $INC "
53
42
54
43
hide_output make -j10
55
44
hide_output make install
56
45
57
46
cd ../..
58
- rm -rf clang
47
+ rm -rf llvm-project
0 commit comments