summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2016-06-04 23:38:29 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2016-06-04 23:38:29 (GMT)
commitae683657b708b38b6ddff4afeb1d21fc908d67d0 (patch)
treea71a908b33a0ffa836fbfb7b60d52c586dd05e4a
parent5f2702b7bf921cf082a41dd24d2eec49714ee567 (diff)
downloadcpython-ae683657b708b38b6ddff4afeb1d21fc908d67d0.zip
cpython-ae683657b708b38b6ddff4afeb1d21fc908d67d0.tar.gz
cpython-ae683657b708b38b6ddff4afeb1d21fc908d67d0.tar.bz2
- Issue #21277: Don't try to link _ctypes with a ffi_convenience library.
-rw-r--r--Misc/NEWS2
-rw-r--r--setup.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4b82ccd..f0d2008 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1290,6 +1290,8 @@ Tests
Build
-----
+- Issue #21277: Don't try to link _ctypes with a ffi_convenience library.
+
- Issue #26884: Fix linking extension modules for cross builds.
Patch by Xavier de Gaye.
diff --git a/setup.py b/setup.py
index 636dd09..006ecdd 100644
--- a/setup.py
+++ b/setup.py
@@ -2007,7 +2007,7 @@ class PyBuildExt(build_ext):
break
ffi_lib = None
if ffi_inc is not None:
- for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
+ for lib_name in ('ffi', 'ffi_pic'):
if (self.compiler.find_library_file(lib_dirs, lib_name)):
ffi_lib = lib_name
break