diff options
| author | Nicholas Bishop <nbishop@nbishop.net> | 2022-11-20 01:22:40 +0000 |
|---|---|---|
| committer | Nicholas Bishop <nbishop@nbishop.net> | 2022-11-20 19:16:43 +0000 |
| commit | 01a2a546bea08e6b561f99fe09aa94df3f185bbc (patch) | |
| tree | d96b4407dfb3226e856366124bcca511f49109b9 | |
| parent | eafe61d6bd9d983535a90b29ef5497b0a6e42019 (diff) | |
| download | rust-01a2a546bea08e6b561f99fe09aa94df3f185bbc.tar.gz rust-01a2a546bea08e6b561f99fe09aa94df3f185bbc.zip | |
test-various: Use clang for the UEFI test
This syncs it with how the UEFI targets are built in dist-various-2.
| -rw-r--r-- | src/ci/docker/host-x86_64/test-various/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile index b0f35bcb9cc..0bddffa3436 100644 --- a/src/ci/docker/host-x86_64/test-various/Dockerfile +++ b/src/ci/docker/host-x86_64/test-various/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:20.04 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + clang-11 \ g++ \ make \ ninja-build \ @@ -67,7 +68,9 @@ ENV MUSL_TARGETS=x86_64-unknown-linux-musl \ ENV MUSL_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $MUSL_TARGETS COPY host-x86_64/test-various/uefi_qemu_test /uefi_qemu_test -ENV UEFI_TARGETS=x86_64-unknown-uefi +ENV UEFI_TARGETS=x86_64-unknown-uefi \ + CC_x86_64_unknown_uefi=clang-11 \ + CXX_x86_64_unknown_uefi=clang++-11 ENV UEFI_SCRIPT python3 /checkout/x.py --stage 2 build --host='' --target $UEFI_TARGETS && \ python3 -u /uefi_qemu_test/run.py |