[Python-checkins] cpython (merge 3.5 -> default): - merge 3.5

[matthias.klose]

https://hg.python.org/cpython/rev/3a5a442597f1
changeset:   101727:3a5a442597f1
parent:      101725:6247dd0f230e
parent:      101726:d00837de03d7
user:        doko at ubuntu.com
date:        Sun Jun 05 00:44:01 2016 +0200
summary:
   - merge 3.5

files:
  Lib/distutils/command/build_ext.py |  2 +-
  Misc/NEWS                          |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -748,7 +748,7 @@
             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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1286,6 +1286,9 @@
 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.
 

-- 
Repository URL: https://hg.python.org/cpython