summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-07-24 10:45:39 (GMT)
committerNed Deily <nad@acm.org>2012-07-24 10:45:39 (GMT)
commitc59cc8f5ea4f5a7a1bf592fbca662e0f305bceef (patch)
tree0549faa537ff03780a7fc870ef3c7fda2458fde4 /Misc
parente9f35cc149ed519435845e299aab0a07b5848307 (diff)
parentecd4e9de5afab6a5d75a6fa7ebfb62804ba69264 (diff)
downloadcpython-c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef.zip
cpython-c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef.tar.gz
cpython-c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef.tar.bz2
Issue #14197: merge
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
-rw-r--r--Misc/python-config.in3
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index a240390..6ab407d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -229,6 +229,9 @@ Tests
Build
-----
+- Issue #14197: For OS X framework builds, ensure links to the shared
+ library are created with the proper ABI suffix.
+
- Issue #14330: For cross builds, don't use host python, use host search paths
for host compiler.
diff --git a/Misc/python-config.in b/Misc/python-config.in
index 1d4a81d..79f0bb1 100644
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -52,7 +52,8 @@ for opt in opt_flags:
if opt == '--ldflags':
if not getvar('Py_ENABLE_SHARED'):
libs.insert(0, '-L' + getvar('LIBPL'))
- libs.extend(getvar('LINKFORSHARED').split())
+ if not getvar('PYTHONFRAMEWORK'):
+ libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs))
elif opt == '--extension-suffix':