Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.

diff --git a/Misc/NEWS b/Misc/NEWS
index 21bd7792fcc036e36e3501fad1451ac2c0ba38e6..e263aacb8aab11ccbd2e80201218201ba961b8fa 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,8 @@ Tests
 Tools/Demos
 -----------
 
+- Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.
+
 - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
   Patch by Arfrever Frehtes Taifersar Arahesis.
 

diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py
index 479ca3c14b470809efe0658b45fa00cb443813f0..d0e3c3fb56e6a31c9294a9b719e29263ae29be15 100755 (executable)
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -219,6 +219,7 @@ def main():
 
     # locations derived from options
     version = sys.version[:3]
+    flagged_version = version + sys.abiflags
     if win:
         extensions_c = 'frozen_extensions.c'
     if ishome:
@@ -233,10 +234,11 @@ def main():
             frozendllmain_c = os.path.join(exec_prefix, 'Pc\\frozen_dllmain.c')
     else:
         binlib = os.path.join(exec_prefix,
-                              'lib', 'python%s' % version, 'config')
-        incldir = os.path.join(prefix, 'include', 'python%s' % version)
+                              'lib', 'python%s' % version,
+                              'config-%s' % flagged_version)
+        incldir = os.path.join(prefix, 'include', 'python%s' % flagged_version)
         config_h_dir = os.path.join(exec_prefix, 'include',
-                                    'python%s' % version)
+                                    'python%s' % flagged_version)
         config_c_in = os.path.join(binlib, 'config.c.in')
         frozenmain_c = os.path.join(binlib, 'frozenmain.c')
         makefile_in = os.path.join(binlib, 'Makefile')
@@ -455,7 +457,7 @@ def main():
 
     cflags = ['$(OPT)']
     cppflags = defines + includes
-    libs = [os.path.join(binlib, 'libpython$(VERSION).a')]
+    libs = [os.path.join(binlib, '$(LDLIBRARY)')]
 
     somevars = {}
     if os.path.exists(makefile_in):