Skip to content

Commit f8df4ea

Browse files
committed
Use latest clang versions from kernel.org
1 parent 494f6d4 commit f8df4ea

4 files changed

Lines changed: 30 additions & 6 deletions

File tree

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang \
14-
lld
13+
xz-utils \
14+
wget
15+
16+
RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64.tar.gz -O llvm.tar.xz
17+
RUN mkdir llvm
18+
RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
19+
20+
ENV PATH="/llvm/bin:$PATH"
1521

1622
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
1723
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -cpu max -L /usr/aarch64-linux-gnu" \

ci/docker/aarch64_be-unknown-linux-gnu/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
qemu-user \
1010
make \
1111
file \
12-
clang \
1312
curl \
1413
xz-utils \
15-
lld
14+
wget
1615

1716
ENV TOOLCHAIN="arm-gnu-toolchain-14.3.rel1-x86_64-aarch64_be-none-linux-gnu"
1817

@@ -21,6 +20,12 @@ RUN curl -L "https://developer.arm.com/-/media/Files/downloads/gnu/14.3.rel1/bin
2120
RUN tar -xvf "${TOOLCHAIN}.tar.xz"
2221
RUN mkdir /toolchains && mv "./${TOOLCHAIN}" /toolchains
2322

23+
RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64.tar.gz -O llvm.tar.xz
24+
RUN mkdir llvm
25+
RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
26+
27+
ENV PATH="/llvm/bin:$PATH"
28+
2429
ENV AARCH64_BE_TOOLCHAIN="/toolchains/${TOOLCHAIN}"
2530
ENV AARCH64_BE_LIBC="${AARCH64_BE_TOOLCHAIN}/aarch64_be-none-linux-gnu/libc"
2631

ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang \
14-
lld
13+
wget
14+
15+
RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64.tar.gz -O llvm.tar.xz
16+
RUN mkdir llvm
17+
RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
18+
19+
ENV PATH="/llvm/bin:$PATH"
20+
1521
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
1622
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -cpu max -L /usr/arm-linux-gnueabihf" \
1723
OBJDUMP=arm-linux-gnueabihf-objdump

ci/docker/x86_64-unknown-linux-gnu/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
RUN wget http://ci-mirrors.rust-lang.org/sde-external-10.8.0-2026-03-15-lin.tar.xz -O sde.tar.xz
1616
RUN mkdir intel-sde
1717
RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde
18+
19+
RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64.tar.gz -O llvm.tar.xz
20+
RUN mkdir llvm
21+
RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
22+
23+
ENV PATH="/llvm/bin:$PATH"
24+
1825
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \
1926
-cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu/cpuid.def \
2027
-rtm-mode full -tsx --"

0 commit comments

Comments
 (0)