Skip to content

Commit edb04ad

Browse files
morrisonleviclaude
andcommitted
fix: update remaining llvm17/clang17 references to 19
- Alpine compile extension image: llvm17-libs/clang17-dev/llvm17 → 19 - build-profiler.sh, generate-profiler.php, build-debug-artifact: Alpine aarch64 clang symlink llvm17 → llvm19 - appsec/cmake/clang-format.cmake: llvm@17 → llvm@19 - centos-7 base.Dockerfile: remove -DCLANG_BUILD_TOOLS=OFF which prevented the clang binary itself from being built/installed, leaving broken symlinks and breaking bindgen Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent e5f9a20 commit edb04ad

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

.gitlab/build-profiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717
# /usr/lib/llvm20/lib/clang/20/include/arm_neon.h:6374:25: error: incompatible constant for this __builtin_neon function
1818
# etc.
1919
if [ -f /sbin/apk ] && [ $(uname -m) = "aarch64" ]; then
20-
ln -sf ../lib/llvm17/bin/clang /usr/bin/clang
20+
ln -sf ../lib/llvm19/bin/clang /usr/bin/clang
2121
fi
2222

2323
set -u

.gitlab/generate-profiler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
IMAGE_SUFFIX: _centos-7
4444
script:
4545
- if [ -d '/opt/rh/devtoolset-7' ]; then set +eo pipefail; source scl_source enable devtoolset-7; set -eo pipefail; fi
46-
- if [ -f /sbin/apk ] && [ $(uname -m) = "aarch64" ]; then ln -sf ../lib/llvm17/bin/clang /usr/bin/clang; fi
46+
- if [ -f /sbin/apk ] && [ $(uname -m) = "aarch64" ]; then ln -sf ../lib/llvm19/bin/clang /usr/bin/clang; fi
4747

4848
- cd profiling
4949
- 'echo "nproc: $(nproc)"'

appsec/cmake/clang-format.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
set(_LLVM17_FORMAT /opt/homebrew/opt/llvm@17/bin/clang-format)
2-
if(EXISTS ${_LLVM17_FORMAT})
3-
set(CLANG_FORMAT ${_LLVM17_FORMAT})
4-
message(STATUS "Using Homebrew LLVM 17 clang-format: ${CLANG_FORMAT}")
1+
set(_LLVM19_FORMAT /opt/homebrew/opt/llvm@19/bin/clang-format)
2+
if(EXISTS ${_LLVM19_FORMAT})
3+
set(CLANG_FORMAT ${_LLVM19_FORMAT})
4+
message(STATUS "Using Homebrew LLVM 19 clang-format: ${CLANG_FORMAT}")
55
else()
6-
find_program(_CF_VERSIONED clang-format-17)
6+
find_program(_CF_VERSIONED clang-format-19)
77
if(NOT _CF_VERSIONED STREQUAL _CF_VERSIONED-NOTFOUND)
88
set(CLANG_FORMAT ${_CF_VERSIONED})
99
else()
@@ -14,15 +14,15 @@ else()
1414
OUTPUT_VARIABLE _CF_VERSION
1515
OUTPUT_STRIP_TRAILING_WHITESPACE
1616
ERROR_QUIET)
17-
if(_CF_VERSION MATCHES " 17\\.")
17+
if(_CF_VERSION MATCHES " 19\\.")
1818
set(CLANG_FORMAT ${_CF_UNVERSIONED})
1919
endif()
2020
endif()
2121
endif()
2222
if(NOT CLANG_FORMAT)
2323
set(CLANG_FORMAT ${CMAKE_CURRENT_LIST_DIR}/clang-tools/clang-format)
2424
if(NOT EXISTS ${CLANG_FORMAT})
25-
message(STATUS "Cannot find clang-format version 17, either set CLANG_FORMAT or make it discoverable")
25+
message(STATUS "Cannot find clang-format version 19, either set CLANG_FORMAT or make it discoverable")
2626
return()
2727
endif()
2828
message(STATUS "Using Docker-based clang-format wrapper: ${CLANG_FORMAT}")

dockerfiles/ci/alpine_compile_extension/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN set -eux; \
3434
# Minimum: libclang. Nice-to-have: full toolchain including linker to play
3535
# with cross-language link-time optimization. Needs to match rustc -Vv's llvm
3636
# version.
37-
RUN apk add --no-cache llvm17-libs clang17-dev lld llvm17 rust-stdlib rust-src cargo clang git protoc unzip
37+
RUN apk add --no-cache llvm19-libs clang19-dev lld llvm19 rust-stdlib rust-src cargo clang git protoc unzip
3838

3939
RUN cargo install --force --locked bindgen-cli && mv /root/.cargo/bin/bindgen /usr/local/bin/ && rm -rf /root/.cargo
4040

dockerfiles/ci/centos/7/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ RUN yum install -y --nogpgcheck devtoolset-9 \
214214
&& git clone --depth 1 -b release/19.x https://github.com/llvm/llvm-project.git \
215215
&& mkdir -vp llvm-project/build \
216216
&& cd llvm-project/build \
217-
&& cmake -G Ninja -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DLLVM_INCLUDE_TESTS=OFF -DLLVM_ENABLE_BINDINGS=OFF -DCLANG_BUILD_TOOLS=OFF -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ../llvm \
217+
&& cmake -G Ninja -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DLLVM_INCLUDE_TESTS=OFF -DLLVM_ENABLE_BINDINGS=OFF -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ../llvm \
218218
&& cmake --build . --parallel $(nproc) --target "install/strip" \
219219
&& rm -f /usr/local/lib/libclang*.a /usr/local/lib/libLLVM*.a \
220220
&& rm -rf /usr/local/include/llvm /usr/local/include/clang \

tooling/bin/build-debug-artifact

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ cp tmp/build_extension/modules/ddtrace.so /output/ddtrace.so")"
218218

219219
if [[ "$BUILD_PROFILER" == "1" ]]; then
220220
PROFILER_SCRIPT="$(_preamble "if [ -f /sbin/apk ] && [ \$(uname -m) = 'aarch64' ]; then
221-
ln -sf ../lib/llvm17/bin/clang /usr/bin/clang
221+
ln -sf ../lib/llvm19/bin/clang /usr/bin/clang
222222
fi
223223
(cd profiling && CARGO_TARGET_DIR=${HOME_DIR}/tmp/build_profiler cargo build --profile profiler-release)
224224
cp ${HOME_DIR}/tmp/build_profiler/profiler-release/libdatadog_php_profiling.so /output/datadog-profiling${EXT_SUFFIX}.so")"

0 commit comments

Comments
 (0)