Skip to content

Commit 6f49d17

Browse files
libdatadog update to 7b8cb2a7
Automated update by CI pipeline https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-php/-/pipelines/128439611 Full CI result: ❌ 2 job(s) failed
1 parent af463f7 commit 6f49d17

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.gitlab/compile_extension.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@ if [ "${WITH_ASAN}" -eq "1" ]; then
1919
export ASAN=1
2020
export COMPILE_ASAN=1
2121
fi
22-
# Compile Rust and PHP in parallel
22+
# Compile Rust and PHP in parallel.
23+
# Wait on each pid individually: bare `wait` always returns 0, so a failing
24+
# cargo/make would be swallowed by `set -e` and only surface later as a
25+
# confusing "no such file or directory: target/debug/libdatadog_php.a" from the
26+
# link step, hiding the real compiler error.
2327
SHARED=1 ./compile_rust.sh &
28+
rust_pid=$!
2429
make -j static &
25-
wait
30+
make_pid=$!
31+
wait "${rust_pid}"
32+
wait "${make_pid}"
2633

2734
# Link extension
2835
sed -i 's/-export-symbols .*\/datadog\.sym/-Wl,--retain-symbols-file=datadog.sym/g' ${EXTENSION_DIR}/ddtrace.ldflags

libdatadog

Submodule libdatadog updated 100 files

0 commit comments

Comments
 (0)