diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2025-04-17 12:33:16 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-04-24 08:05:31 +0000 |
| commit | 115705cda4423243a7453daae9df02e281f7ba41 (patch) | |
| tree | 4942692cc0b2ad1eb236d4b0ab6b12e116da04b1 /tools/docker/env | |
| parent | 9882047a78fc9ecc64da219b2fb28f2708da44af (diff) | |
tools/docker: migrate to llvm-20
clang-15 is now the minimum required version, so we're already on the
verge of not being able to compile the Linux kernel.
But keep clang-15 anyway - it will be used during bisections.
Diffstat (limited to 'tools/docker/env')
| -rw-r--r-- | tools/docker/env/Dockerfile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 22fde62eb..e77a53073 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -90,15 +90,15 @@ ENV GOMODCACHE /syzkaller/.cache/gomod # Install clang. RUN apt-get install -y -q gnupg software-properties-common apt-transport-https RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -RUN add-apt-repository "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-15 main" +RUN echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-20 main" | sudo tee /etc/apt/sources.list.d/llvm-20.list RUN apt-get update --allow-releaseinfo-change -RUN apt-get install -y -q --no-install-recommends clang-15 clang-format-15 clang-tidy-15 lld-15 +RUN apt-get install -y -q --no-install-recommends clang-20 clang-format-20 clang-tidy-20 lld-20 RUN apt-get install -y -q --no-install-recommends flatbuffers-compiler -RUN sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100 -RUN sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 100 -RUN sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 100 -RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 100 -RUN sudo update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/lld-15 100 +RUN sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100 +RUN sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100 +RUN sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-20 100 +RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 100 +RUN sudo update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/lld-20 100 RUN apt autoremove -y -q # Install the Spanner emulator. |