Skip to content

Commit 5a0ad85

Browse files
committed
CI Linux: prefer clang++ for live555 build if present
Clang usually newer in distros and in AlmaLinux 8 (alt build), GCC 8 doesn't recognize -std=c++20 used by live555 (needs c++2a) but Clang 21 does. + drop -DNO_STD_LIB added in commit 2eef496 (no longer needed)
1 parent cc1ef18 commit 5a0ad85

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

.github/scripts/install-common-deps.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,12 @@ download_build_live555() (
110110
pacman -Rs --noconfirm binutils
111111
elif [ "$(uname -s)" = Linux ]; then
112112
./genMakefiles linux-with-shared-libraries
113-
make -j "$(nproc)" CPLUSPLUS_COMPILER="c++ -DNO_STD_LIB"
113+
# prefer clang++ if present - usually newer in distros and eg in
114+
# Alma 8, GCC 8 requires c++2a but mkfile has c++20, Clang 21 OK
115+
if command -v clang++ >/dev/null; then
116+
set -- CXX=clang++
117+
fi
118+
make -j "$(nproc)" "$@"
114119
else
115120
./genMakefiles macosx-no-openssl
116121
live555_rm_tests

0 commit comments

Comments
 (0)