From 2bd24565c4e0f9916a5b8bb489a56c590b9a1074 Mon Sep 17 00:00:00 2001 From: messense Date: Sat, 28 May 2022 15:07:10 +0800 Subject: [PATCH] Rename `fixup_import_libs` to `generate_import_libs` --- pyo3-build-config/src/impl_.rs | 20 ++++++++++++-------- pyo3-build-config/src/lib.rs | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs index 841da12a7fe..4fba11e2172 100644 --- a/pyo3-build-config/src/impl_.rs +++ b/pyo3-build-config/src/impl_.rs @@ -464,20 +464,24 @@ print("mingw", get_platform().startswith("mingw")) }) } + #[cfg(feature = "python3-dll-a")] #[allow(clippy::unnecessary_wraps)] - pub fn fixup_import_libs(&mut self) -> Result<()> { + pub fn generate_import_libs(&mut self) -> Result<()> { // Auto generate python3.dll import libraries for Windows targets. - #[cfg(feature = "python3-dll-a")] - { - if self.lib_dir.is_none() { - let target = target_triple_from_env(); - let py_version = if self.abi3 { None } else { Some(self.version) }; - self.lib_dir = self::import_lib::generate_import_lib(&target, py_version)?; - } + if self.lib_dir.is_none() { + let target = target_triple_from_env(); + let py_version = if self.abi3 { None } else { Some(self.version) }; + self.lib_dir = import_lib::generate_import_lib(&target, py_version)?; } Ok(()) } + #[cfg(not(feature = "python3-dll-a"))] + #[allow(clippy::unnecessary_wraps)] + pub fn generate_import_libs(&mut self) -> Result<()> { + Ok(()) + } + #[doc(hidden)] /// Serialize the `InterpreterConfig` and print it to the environment for Cargo to pass along /// to dependent packages during build time. diff --git a/pyo3-build-config/src/lib.rs b/pyo3-build-config/src/lib.rs index 6d20fd8f362..260ef0da745 100644 --- a/pyo3-build-config/src/lib.rs +++ b/pyo3-build-config/src/lib.rs @@ -178,7 +178,7 @@ pub mod pyo3_build_script_impl { pub fn resolve_interpreter_config() -> Result { if !CONFIG_FILE.is_empty() { let mut interperter_config = InterpreterConfig::from_reader(Cursor::new(CONFIG_FILE))?; - interperter_config.fixup_import_libs()?; + interperter_config.generate_import_libs()?; Ok(interperter_config) } else if let Some(interpreter_config) = make_cross_compile_config()? { // This is a cross compile and need to write the config file.