Merge #1592

1592: Always set `PYO3_PYTHON` if interpreter is runnable regardless of abi3 r=messense a=messense It can be useful in build scripts, like pyca/cryptography#8815 (comment) Co-authored-by: messense <[email protected]>
PyO3 · May 6, 2023 · 93bbf2b · 93bbf2b
2 parents ea793e8 + 41298d7
commit 93bbf2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/build_options.rs b/src/build_options.rs
@@ -995,6 +995,7 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result<Br
 
     if !(bridge.is_bindings("pyo3") || bridge.is_bindings("pyo3-ffi")) {
         eprintln!("🔗 Found {bridge} bindings");
+        return Ok(bridge);
     }
 
     for &lib in PYO3_BINDING_CRATES.iter() {

diff --git a/src/compile.rs b/src/compile.rs
@@ -6,6 +6,7 @@ use crate::{BuildContext, PythonInterpreter, Target};
 use anyhow::{anyhow, bail, Context, Result};
 use fat_macho::FatWriter;
 use fs_err::{self as fs, File};
+use normpath::PathExt;
 use std::collections::HashMap;
 use std::env;
 use std::io::{BufReader, Read};
@@ -369,9 +370,12 @@ fn compile_target(
         if interpreter.runnable {
             if bridge_model.is_bindings("pyo3")
                 || bridge_model.is_bindings("pyo3-ffi")
-                || (matches!(bridge_model, BridgeModel::BindingsAbi3(_, _))
-                    && interpreter.interpreter_kind.is_pypy())
+                || matches!(bridge_model, BridgeModel::BindingsAbi3(_, _))
             {
+                debug!(
+                    "Setting PYO3_PYTHON to {}",
+                    interpreter.executable.display()
+                );
                 build_command
                     .env("PYO3_PYTHON", &interpreter.executable)
                     .env(
@@ -389,7 +393,11 @@ fn compile_target(
             && env::var_os("PYO3_CONFIG_FILE").is_none()
         {
             let pyo3_config = interpreter.pyo3_config_file();
-            let maturin_target_dir = context.target_dir.join("maturin");
+            let maturin_target_dir = context
+                .target_dir
+                .join("maturin")
+                .normalize()?
+                .into_path_buf();
             let config_file = maturin_target_dir.join(format!(
                 "pyo3-config-{}-{}.{}.txt",
                 target_triple, interpreter.major, interpreter.minor