diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 975882f9..f801ddda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: "*" @@ -146,7 +145,6 @@ jobs: build-type: "RelWithDebInfo" asan: true ubsan: true - cxxflags: "-fexperimental-library" - compiler: "apple-clang" version: "*" @@ -161,7 +159,6 @@ jobs: shared: true build-type: "Release" build-cmake: true - cxxflags: "-fexperimental-library" - compiler: "apple-clang" version: "*" @@ -175,7 +172,6 @@ jobs: macos: true shared: true build-type: "Release" - cxxflags: "-fexperimental-library" - compiler: "apple-clang" version: "*" @@ -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) @@ -778,7 +774,6 @@ jobs: variant=release \ link=shared \ rtti=on \ - cxxflags="-fexperimental-library" \ -q \ -j$(sysctl -n hw.ncpu) @@ -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) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 1eeafd60..da34fc22 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -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' diff --git a/CMakeLists.txt b/CMakeLists.txt index 009e0d20..ab7c7cb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,9 +67,6 @@ target_compile_definitions(boost_corosio $,BOOST_COROSIO_DYN_LINK,BOOST_COROSIO_STATIC_LINK> PRIVATE BOOST_COROSIO_SOURCE) -target_compile_options(boost_corosio - PRIVATE - $<$:-fcoroutines>) set_target_properties(boost_corosio PROPERTIES EXPORT_NAME corosio) if (BOOST_COROSIO_MRDOCS_BUILD) diff --git a/build/Jamfile b/build/Jamfile index 5394efe8..a1376cb6 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -20,7 +20,6 @@ project boost/corosio : requirements $(c20-requires) BOOST_COROSIO_SOURCE - gcc:-fcoroutines : common-requirements shared:BOOST_COROSIO_DYN_LINK static:BOOST_COROSIO_STATIC_LINK diff --git a/cmake/CorosioBuild.cmake b/cmake/CorosioBuild.cmake index 994e0a09..354aa2d7 100644 --- a/cmake/CorosioBuild.cmake +++ b/cmake/CorosioBuild.cmake @@ -165,9 +165,6 @@ function(corosio_add_tls_library name) target_include_directories(${_target} PRIVATE $) target_compile_definitions(${_target} PRIVATE BOOST_COROSIO_SOURCE) - target_compile_options(${_target} - PRIVATE - $<$:-fcoroutines>) endfunction() # corosio_install() diff --git a/perf/bench/CMakeLists.txt b/perf/bench/CMakeLists.txt index 38916af0..4bacb517 100644 --- a/perf/bench/CMakeLists.txt +++ b/perf/bench/CMakeLists.txt @@ -32,7 +32,6 @@ target_link_libraries(corosio_bench Threads::Threads) target_compile_options(corosio_bench PRIVATE - $<$:-fcoroutines> $<$:/EHsc>) set_property(TARGET corosio_bench PROPERTY FOLDER "perf/benchmarks") diff --git a/test/unit/Jamfile b/test/unit/Jamfile index 188f72de..8ff0fe5c 100644 --- a/test/unit/Jamfile +++ b/test/unit/Jamfile @@ -17,7 +17,6 @@ project boost/corosio/test/unit ../../../capy/extra/test_suite . ../.. - gcc:-fcoroutines ; # Non-TLS tests