Skip to content

Commit 64936d6

Browse files
committed
tooling: Handle GCC versions >= 11
1 parent ec4c6d7 commit 64936d6

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.github/workflows/build-cloe.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ jobs:
4848
run: |
4949
conan profile new --detect default &&
5050
conan profile update settings.build_type=${{ matrix.build_type }} default &&
51-
conan profile update settings.compiler.libcxx=libstdc++11 default
51+
conan profile update settings.compiler.libcxx=libstdc++11 default &&
52+
# NOTE: Boost 1.69 has a bug (fixed in 74fb0a26099bc51d717f5f154b37231ce7df3e98) that
53+
# prevents GCC >= 11 from interoperation, so disable the server for this case.
54+
# (The server feature depends on cloe-oak, which *currently* depends on Boost <= 1.69.)
55+
if [ $(gcc -dumpversion) -ge 11 ]; then
56+
conan profile update options.cloe-engine:server=False default;
57+
fi
5258
- name: Build cloe w/ package
5359
run: |
5460
make -f Makefile.all export-vendor &&

Dockerfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ ENV CONAN_NON_INTERACTIVE=yes
5757
COPY dist/conan /cloe/dist/conan
5858
RUN make -f /cloe/Makefile.setup setup-conan && \
5959
conan config set general.default_profile=${CONAN_PROFILE} && \
60-
conan profile update options.cloe-engine:server=False ${CONAN_PROFILE}
60+
# NOTE: Boost 1.69 has a bug (fixed in 74fb0a26099bc51d717f5f154b37231ce7df3e98) that
61+
# prevents GCC >= 11 from interoperation, so disable the server for this case.
62+
# (The server feature depends on cloe-oak, which *currently* depends on Boost <= 1.69.)
63+
if [ $(gcc -dumpversion) -ge 11 ]; then \
64+
conan profile update options.cloe-engine:server=False ${CONAN_PROFILE}; \
65+
fi
6166

6267
# Build and Install Cloe
6368
#

0 commit comments

Comments
 (0)