From 19a7161587d9eb6ca0fed711bb8ce5202636a4fa Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Mon, 1 Apr 2024 15:37:34 -0700 Subject: [PATCH] Add clang 16 toolchain to linux workers. (#2794) Resolves Buildbot failures for 24 lts builders that have not migrated to clang 17. b/332306066 --- docker/linux/base/build/Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker/linux/base/build/Dockerfile b/docker/linux/base/build/Dockerfile index 8f08f7bc5a87..50d86ca9cba9 100644 --- a/docker/linux/base/build/Dockerfile +++ b/docker/linux/base/build/Dockerfile @@ -111,6 +111,18 @@ RUN cd /tmp \ && echo ${COBALT_CLANG_VER} >> ${COBALT_CLANG_TC_HOME}/cr_build_revision \ && rm clang-llvmorg-${COBALT_CLANG_VER}.tgz +# === Install Clang 16 toolchain for all Linux-hosted builds +ARG CLANG_16_TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-16-init-17653-g39da55e8-2 +ARG CLANG_16_BASE_URL=https://commondatastorage.googleapis.com/chromium-browser-clang + +RUN cd /tmp \ + && mkdir -p ${CLANG_16_TC_HOME} \ + && curl --silent -O -J \ + ${CLANG_16_BASE_URL}/Linux_x64/clang-llvmorg-16-init-17653-g39da55e8-2.tgz \ + && tar xf clang-llvmorg-16-init-17653-g39da55e8-2.tgz -C ${CLANG_16_TC_HOME} \ + && echo 16-init-17653-g39da55e8-2 >> ${CLANG_16_TC_HOME}/cr_build_revision \ + && rm clang-llvmorg-16-init-17653-g39da55e8-2.tgz + RUN git config --global --add safe.directory /code WORKDIR /code