From cedf2b516b73aef51848e20d2beb963c185a449f Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Fri, 31 May 2024 16:00:40 +0200
Subject: [PATCH] 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)
---
 .github/scripts/install-common-deps.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh
index cea67bc40..38582f09c 100755
--- a/.github/scripts/install-common-deps.sh
+++ b/.github/scripts/install-common-deps.sh
@@ -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 ..
 }