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

Remove unused cross-compile environment variables 

PYO3_CROSS_VERSION was renamed to PYO3_CROSS_PYTHON_VERSION.

PYO3_CROSS_INCLUDE_DIR was removed in
https://github.com/PyO3/pyo3/pull/1521
This commit is contained in:
Sergey Kvachonok 2021-03-29 08:47:11 +03:00
parent 8ad3827341
commit 6d6d030bf7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.rs
View File

@ -144,8 +144,6 @@ impl CrossCompileConfig {
fn cross_compiling() -> Result<Option<CrossCompileConfig>> { fn cross_compiling() -> Result<Option<CrossCompileConfig>> {
if env::var_os("PYO3_CROSS").is_none() if env::var_os("PYO3_CROSS").is_none()
&& env::var_os("PYO3_CROSS_LIB_DIR").is_none() && env::var_os("PYO3_CROSS_LIB_DIR").is_none()
&& env::var_os("PYO3_CROSS_INCLUDE_DIR").is_none()
&& env::var_os("PYO3_CROSS_VERSION").is_none()
&& env::var_os("PYO3_CROSS_PYTHON_VERSION").is_none() && env::var_os("PYO3_CROSS_PYTHON_VERSION").is_none()
{ {
let target = env::var("TARGET")?; let target = env::var("TARGET")?;
@ -489,7 +487,7 @@ fn windows_hardcoded_cross_compile(
) { ) {
(Some(major), Some(minor), None) => (major, minor), (Some(major), Some(minor), None) => (major, minor),
_ => bail!( _ => bail!(
"Expected major.minor version (e.g. 3.9) for PYO3_CROSS_VERSION, got `{}`", "Expected major.minor version (e.g. 3.9) for PYO3_CROSS_PYTHON_VERSION, got `{}`",
version version
), ),
} }