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
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ jobs:

# macOS (4 configurations)
# kqueue is the default backend on macOS
# Global cxxflags needed until capy adds -fexperimental-library internally

- compiler: "apple-clang"
version: "*"
Expand All @@ -146,7 +145,6 @@ jobs:
build-type: "RelWithDebInfo"
asan: true
ubsan: true
cxxflags: "-fexperimental-library"

- compiler: "apple-clang"
version: "*"
Expand All @@ -161,7 +159,6 @@ jobs:
shared: true
build-type: "Release"
build-cmake: true
cxxflags: "-fexperimental-library"

- compiler: "apple-clang"
version: "*"
Expand All @@ -175,7 +172,6 @@ jobs:
macos: true
shared: true
build-type: "Release"
cxxflags: "-fexperimental-library"

- compiler: "apple-clang"
version: "*"
Expand All @@ -191,7 +187,7 @@ jobs:
coverage: true
coverage-flag: "macos"
build-type: "Debug"
cxxflags: "--coverage -fexperimental-library"
cxxflags: "--coverage"
ccflags: "--coverage"

# Linux GCC (5 configurations)
Expand Down Expand Up @@ -778,7 +774,6 @@ jobs:
variant=release \
link=shared \
rtti=on \
cxxflags="-fexperimental-library" \
-q \
-j$(sysctl -n hw.ncpu)

Expand All @@ -795,7 +790,6 @@ jobs:
cd boost-root
cmake -S . -B build \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="-fexperimental-library" \
-DBOOST_INCLUDE_LIBRARIES="${{ steps.patch.outputs.module }}" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
cmake --build build --target tests -j$(sysctl -n hw.ncpu)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ jobs:
cxxstd: '20'
cc: ${{ steps.setup-cpp.outputs.cc || 'clang' }}
cxx: ${{ steps.setup-cpp.outputs.cxx || 'clang++' }}
cxxflags: '--coverage -fexperimental-library'
cxxflags: '--coverage'
ccflags: '--coverage'
shared: false
cmake-version: '>=3.20'
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ target_compile_definitions(boost_corosio
$<IF:$<BOOL:${BUILD_SHARED_LIBS}>,BOOST_COROSIO_DYN_LINK,BOOST_COROSIO_STATIC_LINK>
PRIVATE
BOOST_COROSIO_SOURCE)
target_compile_options(boost_corosio
PRIVATE
$<$<CXX_COMPILER_ID:GNU>:-fcoroutines>)
set_target_properties(boost_corosio PROPERTIES EXPORT_NAME corosio)

if (BOOST_COROSIO_MRDOCS_BUILD)
Expand Down
1 change: 0 additions & 1 deletion build/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ project boost/corosio
: requirements
$(c20-requires)
<define>BOOST_COROSIO_SOURCE
<toolset>gcc:<cxxflags>-fcoroutines
: common-requirements
<link>shared:<define>BOOST_COROSIO_DYN_LINK
<link>static:<define>BOOST_COROSIO_STATIC_LINK
Expand Down
3 changes: 0 additions & 3 deletions cmake/CorosioBuild.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@ function(corosio_add_tls_library name)
target_include_directories(${_target} PRIVATE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/corosio>)
target_compile_definitions(${_target} PRIVATE BOOST_COROSIO_SOURCE)
target_compile_options(${_target}
PRIVATE
$<$<CXX_COMPILER_ID:GNU>:-fcoroutines>)
endfunction()

# corosio_install()
Expand Down
1 change: 0 additions & 1 deletion perf/bench/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ target_link_libraries(corosio_bench
Threads::Threads)

target_compile_options(corosio_bench PRIVATE
$<$<CXX_COMPILER_ID:GNU>:-fcoroutines>
$<$<CXX_COMPILER_ID:MSVC>:/EHsc>)

set_property(TARGET corosio_bench PROPERTY FOLDER "perf/benchmarks")
Expand Down
1 change: 0 additions & 1 deletion test/unit/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ project boost/corosio/test/unit
<include>../../../capy/extra/test_suite
<include>.
<include>../..
<toolset>gcc:<cxxflags>-fcoroutines
;

# Non-TLS tests
Expand Down
Loading