Skip to content

Commit 5253156

Browse files
committed
build: Align llvm with rust version
1 parent 818835a commit 5253156

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.containerversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
49
1+
50

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ ARG TARGETARCH
2727

2828
RUN apt-get update && apt-get upgrade -y && apt-get install -y wget nano rsync curl gnupg2 jq unzip bzip2 xz-utils
2929

30-
# for clang-*-15, see https://apt.llvm.org/
31-
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/apt/sources.list && \
32-
echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/apt/sources.list && \
30+
# for clang-*-20, see https://apt.llvm.org/. Stay in sync with rust compiler
31+
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" >> /etc/apt/sources.list && \
32+
echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" >> /etc/apt/sources.list && \
3333
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
3434

3535
# Install gcc8-arm-none-eabi
@@ -48,7 +48,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
4848
# Tools for building
4949
RUN apt-get update && apt-get install -y \
5050
make \
51-
llvm-18 \
51+
llvm-20 \
5252
gcc-10 \
5353
binutils \
5454
valgrind \
@@ -80,8 +80,8 @@ RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-10 100
8080
RUN apt-get update && apt-get install -y \
8181
python3 \
8282
python3-pip \
83-
clang-format-18 \
84-
clang-tidy-18
83+
clang-format-20 \
84+
clang-tidy-20
8585

8686
RUN python3 -m pip install --upgrade pip
8787

0 commit comments

Comments
 (0)