fix: use PYO3_CROSS_LIB_DIR value as lib_dir when cross-compiling (#4350

)
PyO3 · Jul 28, 2024 · 49dbfab · 49dbfab
1 parent dae091f
commit 49dbfab
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs
@@ -1405,8 +1405,15 @@ fn cross_compile_from_sysconfigdata(
 ) -> Result<Option<InterpreterConfig>> {
     if let Some(path) = find_sysconfigdata(cross_compile_config)? {
         let data = parse_sysconfigdata(path)?;
-        let config = InterpreterConfig::from_sysconfigdata(&data)?;
         // RFC: ignore lib_dir from sysconfig and use one from CrossCompileConfig input ?
+        let config = if cross_compile_config.lib_dir.is_some() {
+            InterpreterConfig {
+                lib_dir: cross_compile_config.lib_dir.as_ref().map(|path| path.display().to_string()),
+                ..InterpreterConfig::from_sysconfigdata(&data)?
+            }
+        } else {
+            InterpreterConfig::from_sysconfigdata(&data)?
+        };
 
         Ok(Some(config))
     } else {