Merge pull request #2288 from ravenexp/fix-py37-abi-version

pyo3-build-config: Use "m" ABI tag for libpython 3.7 by default
PyO3 · Apr 9, 2022 · 2a54641 · 2a54641
2 parents 1971dd7 + 8f9976a
commit 2a54641
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ PyO3 versions, please see the [migration guide](https://pyo3.rs/latest/migration
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Default to "m" ABI tag when choosing `libpython` link name for CPython 3.7 on Unix. [#2288](https://github.com/PyO3/pyo3/pull/2288)
+
 ## [0.16.3] - 2022-04-05
 
 ### Packaging

diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs
@@ -1505,7 +1505,15 @@ fn default_lib_name_unix(
     match implementation {
         PythonImplementation::CPython => match ld_version {
             Some(ld_version) => format!("python{}", ld_version),
-            None => format!("python{}.{}", version.major, version.minor),
+            None => {
+                if version > PythonVersion::PY37 {
+                    // PEP 3149 ABI version tags are finally gone
+                    format!("python{}.{}", version.major, version.minor)
+                } else {
+                    // Work around https://bugs.python.org/issue36707
+                    format!("python{}.{}m", version.major, version.minor)
+                }
+            }
         },
         PythonImplementation::PyPy => {
             if version >= (PythonVersion { major: 3, minor: 9 }) {
@@ -2142,10 +2150,15 @@ mod tests {
     #[test]
     fn default_lib_name_unix() {
         use PythonImplementation::*;
-        // Defaults to pythonX.Y for CPython
+        // Defaults to python3.7m for CPython 3.7
         assert_eq!(
             super::default_lib_name_unix(PythonVersion { major: 3, minor: 7 }, CPython, None),
-            "python3.7",
+            "python3.7m",
+        );
+        // Defaults to pythonX.Y for CPython 3.8+
+        assert_eq!(
+            super::default_lib_name_unix(PythonVersion { major: 3, minor: 8 }, CPython, None),
+            "python3.8",
         );
         assert_eq!(
             super::default_lib_name_unix(PythonVersion { major: 3, minor: 9 }, CPython, None),