luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure we are cross compiling when any cross env variables are set.

This commit is contained in:
James Hilliard 2021-03-22 07:38:03 -06:00
parent 6e49ba3212
commit 2c3e8b1c50
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix inability to use a named lifetime for `&PyTuple` of `*args` in `#[pyfunction]`. [#1440](https://github.com/PyO3/pyo3/pull/1440) - Fix inability to use a named lifetime for `&PyTuple` of `*args` in `#[pyfunction]`. [#1440](https://github.com/PyO3/pyo3/pull/1440)
- Fix inability to add `#[text_signature]` to some `#[pyproto]` methods. [#1483](https://github.com/PyO3/pyo3/pull/1483) - Fix inability to add `#[text_signature]` to some `#[pyproto]` methods. [#1483](https://github.com/PyO3/pyo3/pull/1483)
- Fix use of Python argument for #[pymethods] inside macro expansions. [#1505](https://github.com/PyO3/pyo3/pull/1505) - Fix use of Python argument for #[pymethods] inside macro expansions. [#1505](https://github.com/PyO3/pyo3/pull/1505)
- Always use cross-compiling configuration if any of the environment variables are set. [#1514](https://github.com/PyO3/pyo3/pull/1514)
## [0.13.2] - 2021-02-12 ## [0.13.2] - 2021-02-12
### Packaging ### Packaging

62
build.rs
View File

@ -151,36 +151,44 @@ impl CrossCompileConfig {
} }
fn cross_compiling() -> Result<Option<CrossCompileConfig>> { fn cross_compiling() -> Result<Option<CrossCompileConfig>> {
let target = env::var("TARGET")?; if env::var_os("PYO3_CROSS").is_none()
let host = env::var("HOST")?; && env::var_os("PYO3_CROSS_LIB_DIR").is_none()
if target == host { && env::var_os("PYO3_CROSS_INCLUDE_DIR").is_none()
// Not cross-compiling && env::var_os("PYO3_CROSS_VERSION").is_none()
return Ok(None); && env::var_os("PYO3_CROSS_PYTHON_VERSION").is_none()
} {
let target = env::var("TARGET")?;
let host = env::var("HOST")?;
if target == host {
// Not cross-compiling
return Ok(None);
}
if target == "i686-pc-windows-msvc" && host == "x86_64-pc-windows-msvc" { if target == "i686-pc-windows-msvc" && host == "x86_64-pc-windows-msvc" {
// Not cross-compiling to compile for 32-bit Python from windows 64-bit // Not cross-compiling to compile for 32-bit Python from windows 64-bit
return Ok(None); return Ok(None);
} }
if target == "x86_64-apple-darwin" && host == "aarch64-apple-darwin" { if target == "x86_64-apple-darwin" && host == "aarch64-apple-darwin" {
// Not cross-compiling to compile for x86-64 Python from macOS arm64 // Not cross-compiling to compile for x86-64 Python from macOS arm64
return Ok(None); return Ok(None);
} }
if target == "aarch64-apple-darwin" && host == "x86_64-apple-darwin" {
// Not cross-compiling to compile for arm64 Python from macOS x86_64
return Ok(None);
}
if host.starts_with(&format!( if target == "aarch64-apple-darwin" && host == "x86_64-apple-darwin" {
"{}-{}-{}", // Not cross-compiling to compile for arm64 Python from macOS x86_64
env::var("CARGO_CFG_TARGET_ARCH")?, return Ok(None);
env::var("CARGO_CFG_TARGET_VENDOR")?, }
env::var("CARGO_CFG_TARGET_OS")?
)) { if host.starts_with(&format!(
// Not cross-compiling if arch-vendor-os is all the same "{}-{}-{}",
// e.g. x86_64-unknown-linux-musl on x86_64-unknown-linux-gnu host env::var("CARGO_CFG_TARGET_ARCH")?,
return Ok(None); env::var("CARGO_CFG_TARGET_VENDOR")?,
env::var("CARGO_CFG_TARGET_OS")?
)) {
// Not cross-compiling if arch-vendor-os is all the same
// e.g. x86_64-unknown-linux-musl on x86_64-unknown-linux-gnu host
return Ok(None);
}
} }
if env::var("CARGO_CFG_TARGET_FAMILY")? == "windows" { if env::var("CARGO_CFG_TARGET_FAMILY")? == "windows" {