aboutsummaryrefslogtreecommitdiffstats
path: root/tools/docker
diff options
context:
space:
mode:
authorAleksandr Nogikh <nogikh@google.com>2025-04-16 16:19:10 +0200
committerAleksandr Nogikh <nogikh@google.com>2025-04-17 07:57:15 +0000
commiteb75b5a2be5115bd3254af6221d0b46b16cc445c (patch)
tree51966151c8ef226893eca3ffe06561ccded0352b /tools/docker
parentb3008567ea0fa2942115d4c4013a16f3ff0e4952 (diff)
tools/docker: add ld.lld to env
We use the env container to update kernel configs and the lack of ld.lld in it prevents the usage of LLVM=1.
Diffstat (limited to 'tools/docker')
-rw-r--r--tools/docker/env/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile
index cc33627a2..22fde62eb 100644
--- a/tools/docker/env/Dockerfile
+++ b/tools/docker/env/Dockerfile
@@ -92,12 +92,13 @@ 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 apt-get update --allow-releaseinfo-change
-RUN apt-get install -y -q --no-install-recommends clang-15 clang-format-15 clang-tidy-15
+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 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 apt autoremove -y -q
# Install the Spanner emulator.