diff options
| author | Josh Stone <jistone@redhat.com> | 2021-10-19 10:24:26 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2021-10-22 09:22:18 -0700 |
| commit | 65150af1b4841feeb8b81f1ada60de1191912590 (patch) | |
| tree | 224932be576d326b9b056bffcd236093a82d083b /src/ci/docker | |
| parent | 68a698baf6bfc61d85ce6e25122a092c60c7f21a (diff) | |
| download | rust-65150af1b4841feeb8b81f1ada60de1191912590.tar.gz rust-65150af1b4841feeb8b81f1ada60de1191912590.zip | |
Update the minimum external LLVM to 11
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-llvm-11/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-11/Dockerfile index c34198708c4..45b555146cf 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-11/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-11-tools \ + llvm-11-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-11 \ --enable-llvm-link-shared \ --set rust.thin-lto-import-instr-limit=10 |