From 61f6a1bead1a04078d91c60bc3d7a2bcf828f0e5 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Thu, 10 Dec 2009 10:29:05 +0000 Subject: [PATCH] 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. ........ --- Lib/distutils/sysconfig.py | 6 +++--- Misc/NEWS | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 8306202fb3d..54ccec49531 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -537,7 +537,7 @@ def get_config_vars(*args): # 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 @@ def get_config_vars(*args): 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 @@ def get_config_vars(*args): 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'): diff --git a/Misc/NEWS b/Misc/NEWS index 622ec92aac4..382160973c9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,10 @@ Build 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 -----