Merge pull request #910 from messense/found-interp

Improve the UX of found interpreters message
PyO3 · May 10, 2022 · 6b5c873 · 6b5c873
2 parents db515cd + 1f0eb21
commit 6b5c873
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/build_options.rs b/src/build_options.rs
@@ -701,6 +701,7 @@ pub fn find_interpreter(
 ) -> Result<Vec<PythonInterpreter>> {
     match bridge {
         BridgeModel::Bindings(binding_name, _) => {
+            let mut native_interpreters = false;
             let mut interpreters = Vec::new();
             if let Some(config_file) = env::var_os("PYO3_CONFIG_FILE") {
                 if !binding_name.starts_with("pyo3") {
@@ -788,7 +789,10 @@ pub fn find_interpreter(
                 }
             } else {
                 match find_interpreter_in_host(bridge, interpreter, target, min_python_minor) {
-                    Ok(host_interps) => interpreters = host_interps,
+                    Ok(host_interps) => {
+                        interpreters = host_interps;
+                        native_interpreters = true;
+                    }
                     Err(err) => {
                         if !interpreter.is_empty()
                             && binding_name.starts_with("pyo3")
@@ -803,14 +807,16 @@ pub fn find_interpreter(
                 }
             }
 
-            println!(
-                "🐍 Found {}",
-                interpreters
-                    .iter()
-                    .map(ToString::to_string)
-                    .collect::<Vec<String>>()
-                    .join(", ")
-            );
+            let interpreters_str = interpreters
+                .iter()
+                .map(ToString::to_string)
+                .collect::<Vec<String>>()
+                .join(", ");
+            if native_interpreters {
+                println!("🐍 Found {}", interpreters_str);
+            } else {
+                println!("🐍 Found cross compiling target {}", interpreters_str);
+            }
 
             Ok(interpreters)
         }

diff --git a/src/python_interpreter/mod.rs b/src/python_interpreter/mod.rs
@@ -678,7 +678,7 @@ impl fmt::Display for PythonInterpreter {
         } else {
             write!(
                 f,
-                "cross compiling target {} {}.{}{}",
+                "{} {}.{}{}",
                 self.config.interpreter_kind,
                 self.config.major,
                 self.config.minor,