- merge 3.5

This commit is contained in:
doko@ubuntu.com 2016-06-05 00:44:01 +02:00
commit 36987d7c8d
2 changed files with 4 additions and 1 deletions

View File

@ -748,7 +748,7 @@ class build_ext(Command):
if sysconfig.get_config_var('Py_ENABLE_SHARED'):
pythonlib = 'python{}.{}{}'.format(
sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff,
sys.abiflags)
sysconfig.get_config_var('ABIFLAGS'))
return ext.libraries + [pythonlib]
else:
return ext.libraries

View File

@ -1286,6 +1286,9 @@ Tests
Build
-----
- Issue #26884: Fix linking extension modules for cross builds.
Patch by Xavier de Gaye.
- Issue #26932: Fixed support of RTLD_* constants defined as enum values,
not via macros (in particular on Android). Patch by Chi Hsuan Yen.