Skip to content

Commit e5a1b2a

Browse files
committed
Remove -fcoroutines and -fexperimental-library flags
Capy now propagates these as PUBLIC compile options, making local flag-setting redundant for downstream consumers.
1 parent 21875c3 commit e5a1b2a

File tree

7 files changed

+2
-17
lines changed

7 files changed

+2
-17
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ jobs:
129129

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

134133
- compiler: "apple-clang"
135134
version: "*"
@@ -146,7 +145,6 @@ jobs:
146145
build-type: "RelWithDebInfo"
147146
asan: true
148147
ubsan: true
149-
cxxflags: "-fexperimental-library"
150148

151149
- compiler: "apple-clang"
152150
version: "*"
@@ -161,7 +159,6 @@ jobs:
161159
shared: true
162160
build-type: "Release"
163161
build-cmake: true
164-
cxxflags: "-fexperimental-library"
165162

166163
- compiler: "apple-clang"
167164
version: "*"
@@ -175,7 +172,6 @@ jobs:
175172
macos: true
176173
shared: true
177174
build-type: "Release"
178-
cxxflags: "-fexperimental-library"
179175

180176
- compiler: "apple-clang"
181177
version: "*"
@@ -191,7 +187,7 @@ jobs:
191187
coverage: true
192188
coverage-flag: "macos"
193189
build-type: "Debug"
194-
cxxflags: "--coverage -fexperimental-library"
190+
cxxflags: "--coverage"
195191
ccflags: "--coverage"
196192

197193
# Linux GCC (5 configurations)
@@ -778,7 +774,6 @@ jobs:
778774
variant=release \
779775
link=shared \
780776
rtti=on \
781-
cxxflags="-fexperimental-library" \
782777
-q \
783778
-j$(sysctl -n hw.ncpu)
784779
@@ -795,7 +790,6 @@ jobs:
795790
cd boost-root
796791
cmake -S . -B build \
797792
-DCMAKE_BUILD_TYPE=Release \
798-
-DCMAKE_CXX_FLAGS="-fexperimental-library" \
799793
-DBOOST_INCLUDE_LIBRARIES="${{ steps.patch.outputs.module }}" \
800794
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
801795
cmake --build build --target tests -j$(sysctl -n hw.ncpu)

.github/workflows/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ jobs:
208208
cxxstd: '20'
209209
cc: ${{ steps.setup-cpp.outputs.cc || 'clang' }}
210210
cxx: ${{ steps.setup-cpp.outputs.cxx || 'clang++' }}
211-
cxxflags: '--coverage -fexperimental-library'
211+
cxxflags: '--coverage'
212212
ccflags: '--coverage'
213213
shared: false
214214
cmake-version: '>=3.20'

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ target_compile_definitions(boost_corosio
6767
$<IF:$<BOOL:${BUILD_SHARED_LIBS}>,BOOST_COROSIO_DYN_LINK,BOOST_COROSIO_STATIC_LINK>
6868
PRIVATE
6969
BOOST_COROSIO_SOURCE)
70-
target_compile_options(boost_corosio
71-
PRIVATE
72-
$<$<CXX_COMPILER_ID:GNU>:-fcoroutines>)
7370
set_target_properties(boost_corosio PROPERTIES EXPORT_NAME corosio)
7471

7572
if (BOOST_COROSIO_MRDOCS_BUILD)

build/Jamfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ project boost/corosio
2020
: requirements
2121
$(c20-requires)
2222
<define>BOOST_COROSIO_SOURCE
23-
<toolset>gcc:<cxxflags>-fcoroutines
2423
: common-requirements
2524
<link>shared:<define>BOOST_COROSIO_DYN_LINK
2625
<link>static:<define>BOOST_COROSIO_STATIC_LINK

cmake/CorosioBuild.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ function(corosio_add_tls_library name)
165165
target_include_directories(${_target} PRIVATE
166166
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/corosio>)
167167
target_compile_definitions(${_target} PRIVATE BOOST_COROSIO_SOURCE)
168-
target_compile_options(${_target}
169-
PRIVATE
170-
$<$<CXX_COMPILER_ID:GNU>:-fcoroutines>)
171168
endfunction()
172169

173170
# corosio_install()

perf/bench/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ target_link_libraries(corosio_bench
3232
Threads::Threads)
3333

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

3837
set_property(TARGET corosio_bench PROPERTY FOLDER "perf/benchmarks")

test/unit/Jamfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ project boost/corosio/test/unit
1717
<include>../../../capy/extra/test_suite
1818
<include>.
1919
<include>../..
20-
<toolset>gcc:<cxxflags>-fcoroutines
2120
;
2221

2322
# Non-TLS tests

0 commit comments

Comments
 (0)