[Python-checkins] r76739 - in python/branches/release26-maint: Lib/distutils/sysconfig.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Thu Dec 10 11:29:05 2009
New Revision: 76739

Log:
Merged revisions 76738 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76738 | ronald.oussoren | 2009-12-10 11:27:09 +0100 (Thu, 10 Dec 2009) | 6 lines
  
  Fix an issue with the detection of a non-existing SDK
  on OSX. Without this patch it wasn't possible after all
  to compile extensions on OSX 10.6 with the binary 
  installer unless the user had installed the (non-default)
  10.4u SDK.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/distutils/sysconfig.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/distutils/sysconfig.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/sysconfig.py	(original)
+++ python/branches/release26-maint/Lib/distutils/sysconfig.py	Thu Dec 10 11:29:05 2009
@@ -537,7 +537,7 @@
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS',
+                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -556,7 +556,7 @@
 
                 if 'ARCHFLAGS' in os.environ:
                     arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS',
+                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -580,7 +580,7 @@
                 if m is not None:
                     sdk = m.group(1)
                     if not os.path.exists(sdk):
-                        for key in ('LDFLAGS', 'BASECFLAGS',
+                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                              # a number of derived variables. These need to be
                              # patched up as well.
                             'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu Dec 10 11:29:05 2009
@@ -103,6 +103,10 @@
   compiles correctly under gcc on x86-64.  This fixes a reported
   problem with the --with-tsc build on x86-64.
 
+- Ensure that it possible to build extensions for the default
+  binary distribution on OSX 10.6 even when the user does not
+  have the 10.4u SDK installed.
+
 Tests
 -----