diff --git a/.github/workflows/bvt-compatibility.yml b/.github/workflows/bvt-compatibility.yml index a6d7a39c..1779d8af 100644 --- a/.github/workflows/bvt-compatibility.yml +++ b/.github/workflows/bvt-compatibility.yml @@ -45,6 +45,7 @@ jobs: CC=clang-${{ matrix.compiler.version }} CXX=clang++-${{ matrix.compiler.version }} CXXFLAGS=-stdlib=libc++ + CXX_STDLIB_MODULES_JSON=/usr/lib/llvm-${{ matrix.compiler.version }}/lib/libc++.modules.json EOF - name: Check toolchain versions @@ -55,12 +56,12 @@ jobs: - name: Build and run test with cmake run: | - cmake --preset default '-DPROXY_BUILD_MODULES=${{ matrix.compiler.modules }}' '-DBUILD_DOC_TESTING=${{ matrix.compiler.doc_tests }}' + cmake --preset default '-DPROXY_BUILD_MODULES=${{ matrix.compiler.modules }}' '-DBUILD_DOC_TESTING=${{ matrix.compiler.doc_tests }}' ${CXX_STDLIB_MODULES_JSON:+"-DCMAKE_CXX_STDLIB_MODULES_JSON=$CXX_STDLIB_MODULES_JSON"} cmake --build --preset default -j ctest --preset default -j - name: Build and run freestanding test with cmake run: | - cmake --preset freestanding '-DPROXY_BUILD_MODULES=${{ matrix.compiler.modules }}' '-DBUILD_DOC_TESTING=${{ matrix.compiler.doc_tests }}' + cmake --preset freestanding '-DPROXY_BUILD_MODULES=${{ matrix.compiler.modules }}' '-DBUILD_DOC_TESTING=${{ matrix.compiler.doc_tests }}' ${CXX_STDLIB_MODULES_JSON:+"-DCMAKE_CXX_STDLIB_MODULES_JSON=$CXX_STDLIB_MODULES_JSON"} cmake --build --preset freestanding -j ctest --preset freestanding -j diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b17bc61..78ef1cc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,10 @@ set(CMAKE_CXX_EXTENSIONS OFF) if(PROXY_FREESTANDING) add_compile_options(-ffreestanding -fno-exceptions -fno-rtti) add_link_options(-nodefaultlibs -lc) + # libstdc++ cannot build its std module with -ffreestanding (https://gcc.gnu.org/PR125460). + if(CMAKE_CXX_STDLIB_MODULES_JSON MATCHES "libstdc\\+\\+\\.modules\\.json$") + set(CMAKE_CXX_STDLIB_MODULES_JSON "") + endif() endif() file(GLOB_RECURSE proxy_public_headers CONFIGURE_DEPENDS