pyo3-build-config: Change for from_sysconfigdata to set the shared property based on PYTHONFRAMEWORK in addition to Py_ENABLE_SHARED in order that a macos Framework build is considered shared just like the logic in from_interpreter
This commit is contained in:
parent
c5517ada47
commit
13f13e5ee1
|
@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
|
||||
### Fixed
|
||||
|
||||
- Considered `PYTHONFRAMEWORK` when cross compiling in order that on macos cross compiling against a [Framework bundle](https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html) is considered shared. [#2233](https://github.com/PyO3/pyo3/pull/2233)
|
||||
|
||||
- Panic during compilation when `PYO3_CROSS_LIB_DIR` is set for some host/target combinations. [#2232](https://github.com/PyO3/pyo3/pull/2232)
|
||||
|
||||
## [0.16.2] - 2022-03-15
|
||||
|
|
|
@ -299,6 +299,11 @@ print("mingw", get_platform().startswith("mingw"))
|
|||
Some("0") | Some("false") | Some("False") => false,
|
||||
_ => bail!("expected a bool (1/true/True or 0/false/False) for Py_ENABLE_SHARED"),
|
||||
};
|
||||
// macOS framework packages use shared linking (PYTHONFRAMEWORK is the framework name, hence the empty check)
|
||||
let framework = match sysconfigdata.get_value("PYTHONFRAMEWORK") {
|
||||
Some(s) => !s.is_empty(),
|
||||
_ => false,
|
||||
};
|
||||
let lib_dir = get_key!(sysconfigdata, "LIBDIR").ok().map(str::to_string);
|
||||
let lib_name = Some(default_lib_name_unix(
|
||||
version,
|
||||
|
@ -313,7 +318,7 @@ print("mingw", get_platform().startswith("mingw"))
|
|||
Ok(InterpreterConfig {
|
||||
implementation,
|
||||
version,
|
||||
shared,
|
||||
shared: shared || framework,
|
||||
abi3: is_abi3(),
|
||||
lib_dir,
|
||||
lib_name,
|
||||
|
|
Loading…
Reference in a new issue