diff options
| author | Alexander Potapenko <glider@google.com> | 2023-02-07 15:55:40 +0100 |
|---|---|---|
| committer | Alexander Potapenko <ramosian.glider@gmail.com> | 2023-02-08 12:25:09 +0100 |
| commit | abbb67b7b0b633b245f8fe91a2c837de43bd568c (patch) | |
| tree | c64f0ac8eea61e2402c0bc1a0a0a0b43ed3a6827 /tools/docker | |
| parent | 15c3d4451c29c10802bd64c6ab84ce7712dda28b (diff) | |
tools/docker: delete clang-kmsan
We are using stock Clang to build KMSAN now
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/env/Dockerfile | 6 | ||||
| -rw-r--r-- | tools/docker/syzbot/Dockerfile | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile index 7212f72c5..ba12b0c8d 100644 --- a/tools/docker/env/Dockerfile +++ b/tools/docker/env/Dockerfile @@ -47,12 +47,6 @@ RUN sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++ 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. -ENV CLANG_KMSAN_VER 610139d2d9ce -RUN curl https://storage.googleapis.com/syzkaller/clang-${CLANG_KMSAN_VER}.tar.gz | tar -C /usr/local/ -xz -RUN ln -s /usr/local/clang-${CLANG_KMSAN_VER} /usr/local/clang-kmsan - # The default Docker prompt is too ugly and takes the whole line: # I have no name!@0f3331d2fb54:~/gopath/src/github.com/google/syzkaller$ RUN echo "export PS1='syz-env🈴 '" > /syzkaller/.bashrc diff --git a/tools/docker/syzbot/Dockerfile b/tools/docker/syzbot/Dockerfile index bdfdcfed9..f6d9e1c03 100644 --- a/tools/docker/syzbot/Dockerfile +++ b/tools/docker/syzbot/Dockerfile @@ -46,12 +46,6 @@ RUN sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/c 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 -# Download and install the custom Clang required to build KMSAN. -# TODO(@ramosian-glider): switch to stable Clang once KMSAN is upstreamed. -ENV CLANG_KMSAN_VER 610139d2d9ce -RUN curl https://storage.googleapis.com/syzkaller/clang-${CLANG_KMSAN_VER}.tar.gz | tar -C /usr/local/ -xz -RUN ln -s /usr/local/clang-${CLANG_KMSAN_VER} /usr/local/clang-kmsan - # Not really GRTE, but it's enough to run some scripts that hardcode the path. RUN mkdir -p /usr/grte/v5/bin && ln -s /usr/bin/python3 /usr/grte/v5/bin/python2.7 |