update ci

Author: Neargye

.github/workflows/ubuntu.yml

@@ -36,6 +36,8 @@ jobs:
       run: |
         if [[ "${{ matrix.compiler.cc }}" == "clang"* ]]; then
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          VERSION="${{ matrix.compiler.cc }}"
+          VERSION="${VERSION#clang-}"
           # Add repositories based on Ubuntu version
           if [[ "${{ matrix.compiler.os }}" == "ubuntu-22.04" ]]; then
             sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main"
@@ -53,7 +55,7 @@ jobs:
             sudo apt-add-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble main"
           fi
           sudo apt update
-          sudo apt install ${{ matrix.compiler.cc }} -y
+          sudo apt install ${{ matrix.compiler.cc }} libc++-${VERSION}-dev libc++abi-${VERSION}-dev -y
         fi
 
     - name: Configure gcc

test/CMakeLists.txt

@@ -58,6 +58,16 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   set(CMAKE_VERBOSE_MAKEFILE ON)
   set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
 
+  # Clang should use its native libc++ instead of libstdc++
+  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(OPTIONS ${OPTIONS} -stdlib=libc++)
+
+    # Clang 22+ treats __COUNTER__ as C2y extension, but Catch2 v2 uses it
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "22.0")
+      set(OPTIONS ${OPTIONS} -Wno-c2y-extensions)
+    endif()
+  endif()
+
   check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG)
   check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG)
 endif()
@@ -71,6 +81,12 @@ function(make_test src target std)
   else()
     target_link_libraries(${target} PRIVATE magic_enum::magic_enum)
   endif()
+
+  # Link with libc++ for Clang
+  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    target_link_libraries(${target} PRIVATE c++ c++abi)
+  endif()
+
   set_target_properties(${target} PROPERTIES CXX_EXTENSIONS OFF)
   if(std)
     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")