Update git actions

firoorg · Feb 13, 2025 · bcec925 · bcec925
1 parent 7bcb2dd
commit bcec925
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/firodex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml
@@ -260,8 +260,8 @@ jobs:
           export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
           export PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/bin:$PATH
           export PATH=$HOME/.nimble/bin:$PATH
-          #export CXXFLAGS=-stdlib=libc++
-          #export LDFLAGS=-stdlib=libc++
+          export CXXFLAGS=-stdlib=libc++
+          export LDFLAGS=-stdlib=libc++
           export CXX=clang++-18
           export CC=clang-18
           cd ci_tools_atomic_dex

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,8 +53,8 @@ endif ()
 
 if (UNIX AND NOT APPLE)
     message("Forcing stdlib C++")
-    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 endif ()
 
 ##! We fetch our dependencies

diff --git a/Dockerfile b/Dockerfile
@@ -84,8 +84,8 @@ RUN cd /build/komodo-wallet-desktop && ./ci_tools_atomic_dex/ci_scripts/linux_sc
 
 ENV CXX=clang++-18
 ENV CC=clang-18
-#ENV CXXFLAGS="-stdlib=libc++ -std=c++20"
-#ENV LDFLAGS="-stdlib=libc++"
+ENV CXXFLAGS="-stdlib=libc++ -std=c++20"
+ENV LDFLAGS="-stdlib=libc++"
 
 # Install Qt
 RUN python3 -m venv /build/.venv && \

diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh
@@ -40,8 +40,8 @@ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 777
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 777
 sudo apt-get update
 sudo apt-get install libc++abi-11-dev libc++-11-dev -y
-#export CXXFLAGS=-stdlib=libc++
-#export LDFLAGS=-stdlib=libc++
+export CXXFLAGS=-stdlib=libc++
+export LDFLAGS=-stdlib=libc++
 export CXX=clang++-18
 export CC=clang-18