diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs index 12f0a9b34c3..841da12a7fe 100644 --- a/pyo3-build-config/src/impl_.rs +++ b/pyo3-build-config/src/impl_.rs @@ -443,18 +443,7 @@ print("mingw", get_platform().startswith("mingw")) // Fixup lib_name if it's not set let lib_name = lib_name.or_else(|| { if let Ok(Ok(target)) = env::var("TARGET").map(|target| target.parse::()) { - if target.operating_system == OperatingSystem::Windows { - Some(default_lib_name_windows( - version, - implementation, - abi3, - false, - )) - } else if is_linking_libpython_for_target(&target) { - Some(default_lib_name_unix(version, implementation, None)) - } else { - None - } + default_lib_name_for_target(version, implementation, abi3, &target) } else { None } @@ -1423,18 +1412,8 @@ fn default_cross_compile(cross_compile_config: &CrossCompileConfig) -> Result Option { + if target.operating_system == OperatingSystem::Windows { + Some(default_lib_name_windows( + version, + implementation, + abi3, + false, + )) + } else if is_linking_libpython_for_target(target) { + Some(default_lib_name_unix(version, implementation, None)) + } else { + None + } +} + fn default_lib_name_windows( version: PythonVersion, implementation: PythonImplementation,