Skip to content

Commit 28c0b6d

Browse files
authored
Rollup merge of rust-lang#55952 - michaelwoerister:newer-clang, r=alexcrichton
Update to Clang 7 on CI. Handles Linux and macOS. Windows seems to already have been updated. r? @Mark-Simulacrum cc @rust-lang/infra
2 parents bfd3833 + f6b8eb7 commit 28c0b6d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Diff for: .travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ install:
227227
chmod +x /usr/local/bin/sccache &&
228228
travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
229229
chmod +x /usr/local/bin/stamp &&
230-
travis_retry curl -f http://releases.llvm.org/6.0.0/clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz | tar xJf - &&
231-
export CC=`pwd`/clang+llvm-6.0.0-x86_64-apple-darwin/bin/clang &&
232-
export CXX=`pwd`/clang+llvm-6.0.0-x86_64-apple-darwin/bin/clang++ &&
230+
travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - &&
231+
export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang &&
232+
export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ &&
233233
export AR=ar
234234
;;
235235
esac

Diff for: src/ci/docker/dist-i686-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN ./build-gcc.sh
6767
COPY dist-x86_64-linux/build-python.sh /tmp/
6868
RUN ./build-python.sh
6969

70-
# Now build LLVM+Clang 6, afterwards configuring further compilations to use the
70+
# Now build LLVM+Clang 7, afterwards configuring further compilations to use the
7171
# clang/clang++ compilers.
7272
COPY dist-x86_64-linux/build-clang.sh /tmp/
7373
RUN ./build-clang.sh

Diff for: src/ci/docker/dist-x86_64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN ./build-gcc.sh
6767
COPY dist-x86_64-linux/build-python.sh /tmp/
6868
RUN ./build-python.sh
6969

70-
# Now build LLVM+Clang 6, afterwards configuring further compilations to use the
70+
# Now build LLVM+Clang 7, afterwards configuring further compilations to use the
7171
# clang/clang++ compilers.
7272
COPY dist-x86_64-linux/build-clang.sh /tmp/
7373
RUN ./build-clang.sh

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -ex
1313

1414
source shared.sh
1515

16-
LLVM=6.0.0
16+
LLVM=7.0.0
1717

1818
mkdir clang
1919
cd clang

Diff for: src/ci/docker/scripts/musl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ hide_output make clean
5151

5252
cd ..
5353

54-
LLVM=60
54+
LLVM=70
5555

5656
# may have been downloaded in a previous run
5757
if [ ! -d libunwind-release_$LLVM ]; then

0 commit comments

Comments
 (0)