luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change default python lib name for Windows when cross compiling 

Stop treating `gnu` abi as mingw by default.
This commit is contained in:
messense 2022-05-11 15:29:51 +08:00
parent 5472fa6917
commit df6e9bcdb2
No known key found for this signature in database
GPG Key ID: BB41A8A2C716CCA9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyo3-build-config/src/impl_.rs
View File

@ -1391,13 +1391,11 @@ fn default_cross_compile(cross_compile_config: &CrossCompileConfig) -> Result<In
.unwrap_or(PythonImplementation::CPython); .unwrap_or(PythonImplementation::CPython);
let lib_name = if cross_compile_config.target.operating_system == OperatingSystem::Windows { let lib_name = if cross_compile_config.target.operating_system == OperatingSystem::Windows {
let mingw = cross_compile_config.target.environment == Environment::Gnu;
Some(default_lib_name_windows( Some(default_lib_name_windows(
version, version,
implementation, implementation,
abi3, abi3,
mingw, false,
)) ))
} else if is_linking_libpython_for_target(&cross_compile_config.target) { } else if is_linking_libpython_for_target(&cross_compile_config.target) {
Some(default_lib_name_unix(version, implementation, None)) Some(default_lib_name_unix(version, implementation, None))
@ -2136,7 +2134,7 @@ mod tests {
version: PythonVersion { major: 3, minor: 8 }, version: PythonVersion { major: 3, minor: 8 },
shared: true, shared: true,
abi3: false, abi3: false,
lib_name: Some("python3.8".into()), lib_name: Some("python38".into()),
lib_dir: Some("/usr/lib/mingw".into()), lib_dir: Some("/usr/lib/mingw".into()),
executable: None, executable: None,
pointer_width: None, pointer_width: None,