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
23 changes: 23 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ jobs:
# OSX compilers
#

- compiler: "apple-clang"
version: "*"
cxx: "clang++"
cc: "clang"
runs-on: "macos-26"
b2-toolset: "clang"
is-latest: true
name: "Apple-Clang (macOS 26)"
shared: true
build-type: "Release"
build-cmake: true

- compiler: "apple-clang"
version: "*"
cxx: "clang++"
Expand All @@ -182,6 +194,17 @@ jobs:
build-type: "RelWithDebInfo"
asan: true

- compiler: "apple-clang"
version: "*"
cxx: "clang++"
cc: "clang"
runs-on: "macos-15"
b2-toolset: "clang"
name: "Apple-Clang (macOS 15)"
shared: false
build-type: "Release"
build-cmake: true

- compiler: "apple-clang"
version: "*"
cxx: "clang++"
Expand Down
9 changes: 9 additions & 0 deletions include/boost/http_proto/server/basic_router.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,15 @@ class basic_router : public /*detail::*/any_router
}
catch(E const& ex)
{
#ifdef __APPLE__
// The Apple linker has a bug whereby it can erroneously
// deduplicate functions with identical codegen even though the
// unwind tables are different. Here we force different codegen
// depending on the type of E.
static volatile int apple_linker_bug_workaround_ = 0;
if(apple_linker_bug_workaround_)
throw ex;
#endif // APPLE
set_resume u(p_);
// VFALCO What if h throws?
auto rv = h(p, ex);
Expand Down
4 changes: 3 additions & 1 deletion test/unit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
# Official repository: https://github.com/cppalliance/http_proto
#

add_subdirectory(../../../url/extra/test_suite test_suite)
if (NOT TARGET boost_url_test_suite)
add_subdirectory(../../../url/extra/test_suite test_suite)
endif()

file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp)
list(APPEND PFILES
Expand Down
Loading