diff options
| author | Josh Stone <jistone@redhat.com> | 2021-10-22 10:50:07 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2021-10-22 10:50:07 -0700 |
| commit | e9f545b9a952f193dbe15730bcbe47784b6e7cde (patch) | |
| tree | a98c1ddfd4ca057030005fa5663764adb0db7b31 /src/ci | |
| parent | 8b0e7095a0814edee204cbf8850a3f25e0ca2b1e (diff) | |
| download | rust-e9f545b9a952f193dbe15730bcbe47784b6e7cde.tar.gz rust-e9f545b9a952f193dbe15730bcbe47784b6e7cde.zip | |
Update the minimum external LLVM to 12
Diffstat (limited to 'src/ci')
| -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-11/Dockerfile) | 6 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-11/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile index 45b555146cf..df1fbc29cf5 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-11/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile @@ -14,8 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - llvm-11-tools \ - llvm-11-dev \ + llvm-12-tools \ + llvm-12-dev \ libedit-dev \ libssl-dev \ pkg-config \ @@ -29,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-11 \ + --llvm-root=/usr/lib/llvm-12 \ --enable-llvm-link-shared \ --set rust.thin-lto-import-instr-limit=10 diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 904e5637870..c51c0892fe6 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -284,7 +284,7 @@ jobs: - name: mingw-check <<: *job-linux-xl - - name: x86_64-gnu-llvm-11 + - name: x86_64-gnu-llvm-12 <<: *job-linux-xl - name: x86_64-gnu-tools @@ -431,7 +431,7 @@ jobs: - name: x86_64-gnu-distcheck <<: *job-linux-xl - - name: x86_64-gnu-llvm-11 + - name: x86_64-gnu-llvm-12 env: RUST_BACKTRACE: 1 <<: *job-linux-xl |