[Python-checkins] cpython (merge 3.6 -> default): Issue #28918: Merge 3.6.

[xavier.degaye]

https://hg.python.org/cpython/rev/ff82dfd558df
changeset:   105573:ff82dfd558df
parent:      105571:c4865975b804
parent:      105572:f9e0c864157c
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Sat Dec 10 16:48:07 2016 +0100
summary:
  Issue #28918: Merge 3.6.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #28918: Fix the cross compilation of xxlimited when Python has been
+  built with Py_DEBUG defined.
+
 - Issue #5322: Fixed setting __new__ to a PyCFunction inside Python code.
   Original patch by Andreas Stührk.
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1631,7 +1631,7 @@
 ##         ext = Extension('xx', ['xxmodule.c'])
 ##         self.extensions.append(ext)
 
-        if 'd' not in sys.abiflags:
+        if 'd' not in sysconfig.get_config_var('ABIFLAGS'):
             ext = Extension('xxlimited', ['xxlimited.c'],
                             define_macros=[('Py_LIMITED_API', '0x03050000')])
             self.extensions.append(ext)

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