about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo>2018-11-14 17:41:54 +0100
committerMichael Woerister <michaelwoerister@posteo>2018-11-14 17:42:06 +0100
commit2ec6f340cd29f289fea1c5a672195ceeaf44c475 (patch)
treee0573553d4eefa49032039ef384f1ae1191f4b8a
parent6f244c9011eb01ae4d167b631ba5e3e163bafa72 (diff)
downloadrust-2ec6f340cd29f289fea1c5a672195ceeaf44c475.tar.gz
rust-2ec6f340cd29f289fea1c5a672195ceeaf44c475.zip
Update CI-clang to 7.0.0 for Linux dists.
-rw-r--r--src/ci/docker/dist-i686-linux/Dockerfile2
-rw-r--r--src/ci/docker/dist-x86_64-linux/Dockerfile2
-rwxr-xr-xsrc/ci/docker/dist-x86_64-linux/build-clang.sh2
-rw-r--r--src/ci/docker/scripts/musl.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/dist-i686-linux/Dockerfile b/src/ci/docker/dist-i686-linux/Dockerfile
index 8df49f364a3..b087ea7899f 100644
--- a/src/ci/docker/dist-i686-linux/Dockerfile
+++ b/src/ci/docker/dist-i686-linux/Dockerfile
@@ -67,7 +67,7 @@ RUN ./build-gcc.sh
 COPY dist-x86_64-linux/build-python.sh /tmp/
 RUN ./build-python.sh
 
-# Now build LLVM+Clang 6, afterwards configuring further compilations to use the
+# Now build LLVM+Clang 7, afterwards configuring further compilations to use the
 # clang/clang++ compilers.
 COPY dist-x86_64-linux/build-clang.sh /tmp/
 RUN ./build-clang.sh
diff --git a/src/ci/docker/dist-x86_64-linux/Dockerfile b/src/ci/docker/dist-x86_64-linux/Dockerfile
index 0a2dae72f73..a1a778c2b2c 100644
--- a/src/ci/docker/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/dist-x86_64-linux/Dockerfile
@@ -67,7 +67,7 @@ RUN ./build-gcc.sh
 COPY dist-x86_64-linux/build-python.sh /tmp/
 RUN ./build-python.sh
 
-# Now build LLVM+Clang 6, afterwards configuring further compilations to use the
+# Now build LLVM+Clang 7, afterwards configuring further compilations to use the
 # clang/clang++ compilers.
 COPY dist-x86_64-linux/build-clang.sh /tmp/
 RUN ./build-clang.sh
diff --git a/src/ci/docker/dist-x86_64-linux/build-clang.sh b/src/ci/docker/dist-x86_64-linux/build-clang.sh
index 4595eacb310..2762f0bf7ec 100755
--- a/src/ci/docker/dist-x86_64-linux/build-clang.sh
+++ b/src/ci/docker/dist-x86_64-linux/build-clang.sh
@@ -13,7 +13,7 @@ set -ex
 
 source shared.sh
 
-LLVM=6.0.0
+LLVM=7.0.0
 
 mkdir clang
 cd clang
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh
index fcebfb93247..11d85471b7c 100644
--- a/src/ci/docker/scripts/musl.sh
+++ b/src/ci/docker/scripts/musl.sh
@@ -51,7 +51,7 @@ hide_output make clean
 
 cd ..
 
-LLVM=60
+LLVM=70
 
 # may have been downloaded in a previous run
 if [ ! -d libunwind-release_$LLVM ]; then