mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

- merge 3.5

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Lib/distutils/command/build_ext.py
View file

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

3
Misc/NEWS
View file

@ -1286,6 +1286,9 @@ Tests
Build 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, - Issue #26932: Fixed support of RTLD_* constants defined as enum values,
not via macros (in particular on Android). Patch by Chi Hsuan Yen. not via macros (in particular on Android). Patch by Chi Hsuan Yen.