diff options
| author | bors <bors@rust-lang.org> | 2018-12-17 04:18:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-17 04:18:14 +0000 |
| commit | 63f8e6e12b3f9655fb58282e7a75f411b7e8b4ee (patch) | |
| tree | 75450095f0d6357635b763ac09087285226ee575 /src/ci | |
| parent | c6fb01d62916afa0c489670b665a39d1fe903a4a (diff) | |
| parent | 6c2d704950a5f05b8ee5468df53d8db9b94e2028 (diff) | |
| download | rust-63f8e6e12b3f9655fb58282e7a75f411b7e8b4ee.tar.gz rust-63f8e6e12b3f9655fb58282e7a75f411b7e8b4ee.zip | |
Auto merge of #56642 - nikic:llvm-6, r=alexcrichton
Bump minimum required LLVM version to 6.0 Based on the discussion in #55842, while the overall position of Rust wrt LLVM continues to be contentious, there does seem to be a consensus that there is no need for continued support of LLVM 5. This PR bumps our version requirement to LLVM 6.0 and makes Travis run against that. I hope that this is going to unblock #52694. If I understand correctly, while this issue still exists in LLVM 6, Ubuntu has backported the relevant patch. r? @alexcrichton
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile (renamed from src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile index 4f90c509726..160b23e0b00 100644 --- a/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - llvm-5.0-tools \ + llvm-6.0-tools \ libedit-dev \ zlib1g-dev \ xz-utils @@ -22,6 +22,6 @@ 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 \ + --llvm-root=/usr/lib/llvm-6.0 \ --enable-llvm-link-shared ENV RUST_CHECK_TARGET check |