Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/bvt-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading