Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-08-12 13:21:49 -07:00 committed by GitHub
parent 0be2ea065e
commit 7d3b05715b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -594,13 +594,13 @@ jobs:
- name: VAR_BUILD_TYPE 7 - name: VAR_BUILD_TYPE 7
if: matrix.centos == 7 if: matrix.centos == 7
run: echo Release > VAR_BUILD_TYPE run: echo MinSizeRel > VAR_BUILD_TYPE
# Using Debug to avoid segfault that appeared around 2021-06-04, # Using Release to avoid segfault that appeared around 2021-06-04,
# apparently when the gcc version changed from 8.3 to 8.4. # apparently when the gcc version changed from 8.3 to 8.4.
- name: VAR_BUILD_TYPE 8 - name: VAR_BUILD_TYPE 8
if: matrix.centos == 8 if: matrix.centos == 8
run: echo Debug > VAR_BUILD_TYPE run: echo Release > VAR_BUILD_TYPE
- name: Configure - name: Configure
shell: bash shell: bash

2
tools/pybind11Config.cmake.in
View File

@ -147,7 +147,7 @@ Add a module and setup all helpers. You can select the type of the library; the
default is ``MODULE``. There are several options: default is ``MODULE``. There are several options:
``OPT_SIZE`` ``OPT_SIZE``
Optimize for size, even if the ``CMAKE_BUILD_TYPE`` is not ``RelSize``. Optimize for size, even if the ``CMAKE_BUILD_TYPE`` is not ``MinSizeRel``.
``THIN_LTO`` ``THIN_LTO``
Use thin TLO instead of regular if there's a choice (pybind11's selection Use thin TLO instead of regular if there's a choice (pybind11's selection
is disabled if ``CMAKE_INTERPROCEDURAL_OPTIMIZATIONS`` is set). is disabled if ``CMAKE_INTERPROCEDURAL_OPTIMIZATIONS`` is set).