Skip to content

Commit adb54c2

Browse files
committed
[CI] Update dist-x86_64-linux to GCC 5.5
This also updates dist-i686-linux, since it borrows the same scripts. While we're at it, update llvm+clang+lld to llvm-project 8.0.0-rc2.
1 parent e0544ca commit adb54c2

File tree

3 files changed

+12
-22
lines changed

3 files changed

+12
-22
lines changed

src/ci/docker/dist-x86_64-linux/build-clang.sh

+8-19
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,14 @@ set -ex
44

55
source 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-
2715
mkdir clang-build
2816
cd clang-build
2917

@@ -39,20 +27,21 @@ cd clang-build
3927
#
4028
# [1]: https://sourceware.org/ml/crossgcc/2008-11/msg00028.html
4129
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"
4331
INC="$INC:/usr/include"
4432

4533
hide_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

5443
hide_output make -j10
5544
hide_output make install
5645

5746
cd ../..
58-
rm -rf clang
47+
rm -rf llvm-project

src/ci/docker/dist-x86_64-linux/build-gcc.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set -ex
33

44
source shared.sh
55

6-
GCC=4.8.5
6+
GCC=5.5.0
77

8-
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
8+
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf -
99
cd gcc-$GCC
1010

1111
# FIXME(#49246): Remove the `sed` below.

src/ci/docker/dist-x86_64-linux/build-perl.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ cd perl-5.28.0
1111
# Gotta do some hackery to tell python about our custom OpenSSL build, but other
1212
# than that fairly normal.
1313
CC=gcc \
14-
CFLAGS='-I /rustroot/include' LDFLAGS='-L /rustroot/lib -L /rustroot/lib64' \
14+
CFLAGS='-I /rustroot/include -fgnu89-inline' \
15+
LDFLAGS='-L /rustroot/lib -L /rustroot/lib64' \
1516
hide_output ./configure.gnu
1617
hide_output make -j10
1718
hide_output make install

0 commit comments

Comments
 (0)