From c04aac99d90c00a22ee49dbd7cfbb0a20a71eb8f Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Tue, 11 Jun 2024 12:18:25 +0200
Subject: [PATCH] CI live555: moved needed C++ flags to CXXFLAGS

---
 .github/scripts/install-common-deps.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh
index 37808992c..2704c7ece 100755
--- a/.github/scripts/install-common-deps.sh
+++ b/.github/scripts/install-common-deps.sh
@@ -75,13 +75,14 @@ install_juice() {
 )
 }
 
-download_build_live555() {
+download_build_live555() {(
         if is_win; then
                 target=mingw
                 PATH=/usr/bin:$PATH
                 # ensure binutils ld is used (not lld)
                 pacman -Sy --noconfirm binutils
         elif [ "$(uname -s)" = Linux ]; then
+                export CXXFLAGS=-DXLOCALE_NOT_USED
                 target=linux
         else
                 target=macosx
@@ -92,10 +93,11 @@ download_build_live555() {
         git checkout 35c375
         ./genMakefiles "$target"
 
-        make -j "$(nproc)"  CPLUSPLUS_COMPILER="c++ -DXLOCALE_NOT_USED"
-        is_win && pacman -Rs --noconfirm binutils
-        cd ..
-}
+        make -j "$(nproc)"
+        if is_win; then
+                pacman -Rs --noconfirm binutils
+        fi
+)}
 
 install_live555() {(
         if [ ! -d live555 ]; then