From 706e67b0a0143d651eb03f2fa2c30645899e81ff Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 9 Dec 2018 11:20:20 +0100
Subject: Bump minimum required LLVM version to 6.0

---
 src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile | 27 ---------------------------
 src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile
 create mode 100644 src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile

(limited to 'src/ci')

diff --git a/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile
deleted file mode 100644
index 4f90c509726..00000000000
--- a/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  g++ \
-  make \
-  file \
-  curl \
-  ca-certificates \
-  python2.7 \
-  git \
-  cmake \
-  sudo \
-  gdb \
-  llvm-5.0-tools \
-  libedit-dev \
-  zlib1g-dev \
-  xz-utils
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-# using llvm-link-shared due to libffi issues -- see #34486
-ENV RUST_CONFIGURE_ARGS \
-      --build=x86_64-unknown-linux-gnu \
-      --llvm-root=/usr/lib/llvm-5.0 \
-      --enable-llvm-link-shared
-ENV RUST_CHECK_TARGET check
diff --git a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile
new file mode 100644
index 00000000000..160b23e0b00
--- /dev/null
+++ b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  file \
+  curl \
+  ca-certificates \
+  python2.7 \
+  git \
+  cmake \
+  sudo \
+  gdb \
+  llvm-6.0-tools \
+  libedit-dev \
+  zlib1g-dev \
+  xz-utils
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+# using llvm-link-shared due to libffi issues -- see #34486
+ENV RUST_CONFIGURE_ARGS \
+      --build=x86_64-unknown-linux-gnu \
+      --llvm-root=/usr/lib/llvm-6.0 \
+      --enable-llvm-link-shared
+ENV RUST_CHECK_TARGET check
-- 
cgit 1.4.1-3-g733a5