gh: use libstdc++

lifting-bits · Feb 29, 2024 · cd00774 · cd00774
1 parent 54bc183
commit cd00774
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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"
       }
     }
   ],