Skip to content

Commit 7d3b057

Browse files
authored
Improved workaround for Centos 8 failure (follow-on to PR #3030). (#3193)
* Rollback of PR #3030 (Working around Centos 8 failure). * Adding `-DCMAKE_BUILD_TYPE=Release` * Improving existing workaround (undoing the originally intended rollback). * Fixing minor documentation bug.
1 parent 0be2ea0 commit 7d3b057

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,13 +594,13 @@ jobs:
594594

595595
- name: VAR_BUILD_TYPE 7
596596
if: matrix.centos == 7
597-
run: echo Release > VAR_BUILD_TYPE
597+
run: echo MinSizeRel > VAR_BUILD_TYPE
598598

599-
# Using Debug to avoid segfault that appeared around 2021-06-04,
599+
# Using Release to avoid segfault that appeared around 2021-06-04,
600600
# apparently when the gcc version changed from 8.3 to 8.4.
601601
- name: VAR_BUILD_TYPE 8
602602
if: matrix.centos == 8
603-
run: echo Debug > VAR_BUILD_TYPE
603+
run: echo Release > VAR_BUILD_TYPE
604604

605605
- name: Configure
606606
shell: bash

tools/pybind11Config.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Add a module and setup all helpers. You can select the type of the library; the
147147
default is ``MODULE``. There are several options:
148148
149149
``OPT_SIZE``
150-
Optimize for size, even if the ``CMAKE_BUILD_TYPE`` is not ``RelSize``.
150+
Optimize for size, even if the ``CMAKE_BUILD_TYPE`` is not ``MinSizeRel``.
151151
``THIN_LTO``
152152
Use thin TLO instead of regular if there's a choice (pybind11's selection
153153
is disabled if ``CMAKE_INTERPROCEDURAL_OPTIMIZATIONS`` is set).

0 commit comments

Comments
 (0)