From 68311bdf2bcddea8012fd9cec24357feaf771fd0 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 16 Oct 2017 12:45:24 -0700
Subject: Bump the minimum LLVM to 3.9

Old LLVM bugs are reportedly cropping up harder, but 3.9 seems to be OK.

Fixes #45277.
---
 src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile | 25 -------------------------
 src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile
 create mode 100644 src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile

(limited to 'src/ci/docker')

diff --git a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile
deleted file mode 100644
index e832a2445ba..00000000000
--- a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile
+++ /dev/null
@@ -1,25 +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-3.7-tools \
-  libedit-dev \
-  zlib1g-dev \
-  xz-utils
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-ENV RUST_CONFIGURE_ARGS \
-      --build=x86_64-unknown-linux-gnu \
-      --llvm-root=/usr/lib/llvm-3.7
-ENV RUST_CHECK_TARGET check
diff --git a/src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile
new file mode 100644
index 00000000000..6b818604898
--- /dev/null
+++ b/src/ci/docker/x86_64-gnu-llvm-3.9/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-3.9-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-3.9 \
+      --enable-llvm-link-shared
+ENV RUST_CHECK_TARGET check
-- 
cgit 1.4.1-3-g733a5