Skip to content

clang.hpp + CMakeLists: apply libc++ workaround under AppleClang too #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fedr merged 2 commits into from
May 22, 2026
+2 −2
Merged

clang.hpp + CMakeLists: apply libc++ workaround under AppleClang too #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f95a3
Apply libc++ __init_primary_exception override under AppleClang too
Fedr May 22, 2026
f0a3076
CMakeLists: spell out two STREQUAL checks instead of a MATCHES regex
Fedr May 22, 2026
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if(MSVC)
endif()

# inject work-around for Clang libc++ and older Xcode versions' compatibility
if(APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if(APPLE AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
target_precompile_headers(fastmcpp_core
PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/include/fastmcpp/clang.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/fastmcpp/clang.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Work around Clang quirk: https://github.com/llvm/llvm-project/issues/86077
// This must be included before `<exception>` to work correctly, so effectively before any standard library headers.
#if defined( __APPLE__ ) && defined( __clang__ ) && !defined( __apple_build_version__ )
#if defined( __APPLE__ ) && defined( __clang__ )
#include <version>
#undef _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
#define _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION 0
Expand Down