diff options
| author | Alexander Potapenko <glider@google.com> | 2023-02-02 15:12:47 +0100 |
|---|---|---|
| committer | Alexander Potapenko <ramosian.glider@gmail.com> | 2023-02-07 11:09:11 +0100 |
| commit | 0cbf19943cd983a8c8abb1d627801b03317bad37 (patch) | |
| tree | 42fb720491bdeeb7942764adac1ba0d0900c6b98 /tools/docker/env | |
| parent | 5bc3be51cc65ecf6d4532ac7c93b6d5d284d5a38 (diff) | |
tools/docker: switch to Clang 15
This is a prerequisite for building KMSAN-instrumented kernels.
Now that https://github.com/google/syzkaller/pull/3649 is landed, the
tests should be passing.
Diffstat (limited to 'tools/docker/env')
| -rw-r--r-- | tools/docker/env/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index a1ad605bf..7212f72c5 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -37,15 +37,15 @@ RUN mkdir -p /syzkaller/gopath/src/github.com/google/syzkaller && \ # The default clang-11 is too old, install the latest one. 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/bullseye/ llvm-toolchain-bullseye-13 main" +RUN add-apt-repository "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-15 main" RUN apt-get update --allow-releaseinfo-change RUN apt-get remove -y -q clang-11 -RUN apt-get install -y -q --no-install-recommends clang-13 clang-format-13 clang-tidy-13 +RUN apt-get install -y -q --no-install-recommends clang-15 clang-format-15 clang-tidy-15 RUN apt autoremove -y -q -RUN sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100 -RUN sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100 -RUN sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-13 100 -RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 100 +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 # Download and install the custom Clang required to build KMSAN. # TODO(@ramosian-glider): switch to stable Clang once KMSAN is upstreamed. |