Merge pull request #1428 from PyO3/macos-arm64-cross

Don't require PYO3_CROSS_LIB_DIR when compiling for x86_64 from macOS arm64 and reverse
PyO3 · Feb 14, 2021 · 7fa3b36 · 7fa3b36
2 parents 07c7624 + ebc52c4
commit 7fa3b36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - Remove FFI definition `PyCFunction_ClearFreeList` for Python 3.9 and later. [#1425](https://github.com/PyO3/pyo3/pull/1425)
+- `PYO3_CROSS_LIB_DIR` enviroment variable no long required when compiling for x86-64 Python from macOS arm64 and reverse. [#1428](https://github.com/PyO3/pyo3/pull/1428)
 
 ## [0.13.2] - 2021-02-12
 ### Packaging

diff --git a/build.rs b/build.rs
@@ -142,6 +142,15 @@ fn cross_compiling() -> Result<Option<CrossCompileConfig>> {
         return Ok(None);
     }
 
+    if target == "x86_64-apple-darwin" && host == "aarch64-apple-darwin" {
+        // Not cross-compiling to compile for x86-64 Python from macOS arm64
+        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!(
         "{}-{}-{}",
         env::var("CARGO_CFG_TARGET_ARCH")?,