diff options
| author | Nikita Popov <npopov@redhat.com> | 2024-02-08 18:30:17 +0100 |
|---|---|---|
| committer | Nikita Popov <npopov@redhat.com> | 2024-02-13 10:33:40 +0100 |
| commit | a47834ef809274b1ed0a55d064979f238dd58293 (patch) | |
| tree | 4a2446a99db6c0ffa593494c704a41c4b52d69dc /src/ci | |
| parent | 41a9cd4810723990151e2b2be3c8c990cd672ace (diff) | |
| download | rust-a47834ef809274b1ed0a55d064979f238dd58293.tar.gz rust-a47834ef809274b1ed0a55d064979f238dd58293.zip | |
Use system clang for wasm32_unknown_unknown on x86-gnu-integration
Fuchsia clang does not include the wasm32 target, so instead install and use system clang for this purpose.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile index bec1c897337..c8c754914aa 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ + clang-15 \ g++ \ make \ ninja-build \ @@ -46,6 +47,9 @@ ENV TARGETS=x86_64-fuchsia ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu ENV TARGETS=$TARGETS,wasm32-unknown-unknown +# Fuchsia clang does not have wasm target enabled, use system clang. +ENV CC_wasm32_unknown_unknown=clang-15 + COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh |