Skip to content

Commit bcec925

Browse files
committed
Update git actions
1 parent 7bcb2dd commit bcec925

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/firodex-desktop-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ jobs:
260260
export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
261261
export PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/bin:$PATH
262262
export PATH=$HOME/.nimble/bin:$PATH
263-
#export CXXFLAGS=-stdlib=libc++
264-
#export LDFLAGS=-stdlib=libc++
263+
export CXXFLAGS=-stdlib=libc++
264+
export LDFLAGS=-stdlib=libc++
265265
export CXX=clang++-18
266266
export CC=clang-18
267267
cd ci_tools_atomic_dex

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ endif ()
5353

5454
if (UNIX AND NOT APPLE)
5555
message("Forcing stdlib C++")
56-
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
57-
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
56+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
57+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
5858
endif ()
5959

6060
##! We fetch our dependencies

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ RUN cd /build/komodo-wallet-desktop && ./ci_tools_atomic_dex/ci_scripts/linux_sc
8484

8585
ENV CXX=clang++-18
8686
ENV CC=clang-18
87-
#ENV CXXFLAGS="-stdlib=libc++ -std=c++20"
88-
#ENV LDFLAGS="-stdlib=libc++"
87+
ENV CXXFLAGS="-stdlib=libc++ -std=c++20"
88+
ENV LDFLAGS="-stdlib=libc++"
8989

9090
# Install Qt
9191
RUN python3 -m venv /build/.venv && \

ci_tools_atomic_dex/ci_scripts/linux_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 777
4040
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 777
4141
sudo apt-get update
4242
sudo apt-get install libc++abi-11-dev libc++-11-dev -y
43-
#export CXXFLAGS=-stdlib=libc++
44-
#export LDFLAGS=-stdlib=libc++
43+
export CXXFLAGS=-stdlib=libc++
44+
export LDFLAGS=-stdlib=libc++
4545
export CXX=clang++-18
4646
export CC=clang-18
4747

0 commit comments

Comments
 (0)