@@ -9,10 +9,10 @@ ENV ACCEPT_EULA=Y
99# with cross-language link-time optimization. Needs to match rustc -Vv's llvm
1010# version.
1111ENV DEVLIBS \
12- libclang-17 -dev \
13- libclang-rt-17 -dev \
14- llvm-17 -dev \
15- lld-17 \
12+ libclang-19 -dev \
13+ libclang-rt-19 -dev \
14+ llvm-19 -dev \
15+ lld-19 \
1616 libbrotli-dev \
1717 libcurl4-openssl-dev \
1818 libedit-dev \
@@ -48,8 +48,8 @@ ENV RUNTIME_DEPS \
4848 apache2 \
4949 apache2-dev \
5050 ca-certificates \
51- clang-format-17 \
52- clang-tidy-17 \
51+ clang-format-19 \
52+ clang-tidy-19 \
5353 curl \
5454 debian-goodies \
5555 git \
@@ -70,7 +70,7 @@ ENV RUNTIME_DEPS \
7070ENV PHPIZE_DEPS \
7171 autoconf \
7272 bison \
73- clang-17 \
73+ clang-19 \
7474 cmake \
7575 dpkg-dev \
7676 file \
@@ -97,12 +97,12 @@ RUN set -eux; \
9797 echo "deb http://deb.debian.org/debian-debug/ bookworm-debug main" | \
9898 tee -a /etc/apt/sources.list; \
9999 \
100- # Use LLVM from orig vendor (also LLVM 17 is not shipped with bookworm)
100+ # Use LLVM from orig vendor (also LLVM 19 is not shipped with bookworm)
101101 apt-get update; \
102102 apt-get install -y curl gnupg software-properties-common; \
103103 curl https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc; \
104- add-apt-repository "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-17 main" ; \
105- add-apt-repository "deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-17 main" ; \
104+ add-apt-repository "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main" ; \
105+ add-apt-repository "deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main" ; \
106106 \
107107# prevent Debian's PHP packages from being installed
108108# https://github.com/docker-library/php/pull/542
@@ -136,14 +136,14 @@ RUN set -eux; \
136136 chown -R circleci:circleci /var/log/nginx/ /var/lib/nginx/; \
137137 \
138138# Make clang the default compiler
139- update-alternatives --install /usr/bin/cc cc /usr/bin/clang-17 100; \
140- update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-17 100; \
141- update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100; \
142- update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100; \
143- update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-17 100; \
144- echo "-L /usr/lib/llvm-17 /lib/clang/17 /lib/linux" > /usr/lib/llvm-17 /bin/clang.cfg; \
139+ update-alternatives --install /usr/bin/cc cc /usr/bin/clang-19 100; \
140+ update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-19 100; \
141+ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 100; \
142+ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 100; \
143+ update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-19 100; \
144+ echo "-L /usr/lib/llvm-19 /lib/clang/19 /lib/linux" > /usr/lib/llvm-19 /bin/clang.cfg; \
145145# Include libasan library path
146- echo /usr/lib/llvm-17 /lib/clang/17 /lib/linux > /etc/ld.so.conf.d/libasan.conf && ldconfig
146+ echo /usr/lib/llvm-19 /lib/clang/19 /lib/linux > /etc/ld.so.conf.d/libasan.conf && ldconfig
147147
148148ENV CMAKE_VERSION="3.24.4"
149149
0 commit comments