diff options
| author | Josh Stone <jistone@redhat.com> | 2017-10-16 12:45:24 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2017-10-16 13:10:16 -0700 |
| commit | 68311bdf2bcddea8012fd9cec24357feaf771fd0 (patch) | |
| tree | cb789738e1e691d257cbfa950e076ded1ae1cb9a | |
| parent | ba4e8d7db311b8a43a446cc20c30e4680b94c5d3 (diff) | |
| download | rust-68311bdf2bcddea8012fd9cec24357feaf771fd0.tar.gz rust-68311bdf2bcddea8012fd9cec24357feaf771fd0.zip | |
Bump the minimum LLVM to 3.9
Old LLVM bugs are reportedly cropping up harder, but 3.9 seems to be OK. Fixes #45277.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile (renamed from src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile) | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 139f06ec570..e97f9d9251f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: fast_finish: true include: # Images used in testing PR and try-build should be run first. - - env: IMAGE=x86_64-gnu-llvm-3.7 RUST_BACKTRACE=1 + - env: IMAGE=x86_64-gnu-llvm-3.9 RUST_BACKTRACE=1 if: type = pull_request OR branch = auto - env: IMAGE=dist-x86_64-linux DEPLOY=1 diff --git a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile index e832a2445ba..6b818604898 100644 --- a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - llvm-3.7-tools \ + llvm-3.9-tools \ libedit-dev \ zlib1g-dev \ xz-utils @@ -19,7 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 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.7 + --llvm-root=/usr/lib/llvm-3.9 \ + --enable-llvm-link-shared ENV RUST_CHECK_TARGET check |