From cd007743cde6549307d9d0e1b3ac5dd9373ee7d9 Mon Sep 17 00:00:00 2001 From: xlauko Date: Thu, 29 Feb 2024 21:43:27 +0000 Subject: [PATCH] gh: use libstdc++ --- .github/workflows/build.yml | 2 +- CMakePresets.json | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed5da03..75442eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: sudo apt-get install -y \ gpg wget curl zip unzip tar git pkg-config \ ninja-build make clang-tidy cppcheck ccache gcc g++ \ - doctest-dev clang-18 lld-18 libc++-18-dev libc++abi-18-dev + doctest-dev clang-18 lld-18 libstdc++-12-dev - name: "Create directory '${{ env.VCPKG_DEFAULT_BINARY_CACHE }}'" run: mkdir -p $VCPKG_DEFAULT_BINARY_CACHE diff --git a/CMakePresets.json b/CMakePresets.json index ac65b95..587fbb4 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -35,13 +35,8 @@ "name": "ci", "inherits": "ninja-multi-vcpkg-doctest", "cacheVariables": { - "CMAKE_EXE_LINKER_FLAGS_INIT": "-fuse-ld=lld", - "CMAKE_MODULE_LINKER_FLAGS_INIT": "-fuse-ld=lld", - "CMAKE_SHARED_LINKER_FLAGS_INIT": "-fuse-ld=lld", "CMAKE_C_COMPILER": "$env{CC}", "CMAKE_CXX_COMPILER": "$env{CXX}", - "CMAKE_CXX_FLAGS": "-stdlib=libc++", - "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++ -lc++abi" } } ],