diff options
| author | bors <bors@rust-lang.org> | 2021-10-23 20:59:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-23 20:59:29 +0000 |
| commit | 45591408b18e7f93fcf8c09210c9a5a102d84b37 (patch) | |
| tree | 5344f3519ec782c658ef5770dc02fe4178b99931 /src/ci/docker | |
| parent | 91b931926fd49fc97d1e39f2b8206abf1d77ce7d (diff) | |
| parent | 8b1504cfb73894040f8096623e6f9d4559c9eb7f (diff) | |
| download | rust-45591408b18e7f93fcf8c09210c9a5a102d84b37.tar.gz rust-45591408b18e7f93fcf8c09210c9a5a102d84b37.zip | |
Auto merge of #90175 - cuviper:min-llvm-12, r=nagisa
Update the minimum external LLVM to 12 With this change, we'll have stable support for LLVM 12 and 13. For reference, the previous increase to LLVM 10 was #83387, and this replaces the pending increase to LLVM 11 in #90062. r? `@nagisa` `@nikic`
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile (renamed from src/ci/docker/host-x86_64/x86_64-gnu-llvm-10/Dockerfile) | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-10/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile index c34198708c4..df1fbc29cf5 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-10/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile @@ -1,5 +1,6 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ gcc-multilib \ @@ -13,8 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - llvm-10-tools \ - llvm-10-dev \ + llvm-12-tools \ + llvm-12-dev \ libedit-dev \ libssl-dev \ pkg-config \ @@ -28,7 +29,7 @@ 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-10 \ + --llvm-root=/usr/lib/llvm-12 \ --enable-llvm-link-shared \ --set rust.thin-lto-import-instr-limit=10 |