CI live555: pass the CPLUSPLUS_COMPILER always

Although not required for platforms other than Linux, it doesn't hurt
if we use this always (reduce script size and complexity).

\+ also removed setting CC/CXX for Win - perhaps no longer needed but
the second is now overriden, anyways (CPLUSPLUS_COPILER is set to CXX
by default but we override it)
This commit is contained in:
Martin Pulec
2024-05-31 16:00:40 +02:00
parent bd91d16b27
commit cedf2b516b

View File

@@ -76,17 +76,13 @@ install_juice() {
}
download_build_live555() {
CPLUSPLUS_COMPILER=c++ # default
if is_win; then
export CC=gcc
export CXX=g++
target=mingw
PATH=/usr/bin:$PATH
# ensure binutils ld is used (not lld)
pacman -Sy --noconfirm binutils
elif [ "$(uname -s)" = Linux ]; then
target=linux-64bit
CPLUSPLUS_COMPILER="c++ -DXLOCALE_NOT_USED"
else
target=macosx
fi
@@ -96,7 +92,7 @@ download_build_live555() {
git checkout 35c375
./genMakefiles "$target"
make -j "$(nproc)" CPLUSPLUS_COMPILER="$CPLUSPLUS_COMPILER"
make -j "$(nproc)" CPLUSPLUS_COMPILER="c++ -DXLOCALE_NOT_USED"
is_win && pacman -Rs --noconfirm binutils
cd ..
}