From 670280470d1da26eb047584ed6e6c22f36bb01f2 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sun, 5 Aug 2012 14:42:45 -0700 Subject: [PATCH] Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. --- Misc/NEWS | 2 ++ setup.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 587c07d2ddf..7010133d6de 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -327,6 +327,8 @@ Tests Build ----- +- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK. + - Issue #8847: Disable COMDAT folding in Windows PGO builds. - Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. diff --git a/setup.py b/setup.py index 6dd0422499d..b5abe611bc3 100644 --- a/setup.py +++ b/setup.py @@ -1028,12 +1028,12 @@ class PyBuildExt(build_ext): if sys.platform == 'darwin': sysroot = macosx_sdk_root() - for d in inc_dirs + sqlite_inc_paths: - f = os.path.join(d, "sqlite3.h") - + for d_ in inc_dirs + sqlite_inc_paths: + d = d_ if sys.platform == 'darwin' and is_macosx_sdk_path(d): - f = os.path.join(sysroot, d[1:], "sqlite3.h") + d = os.path.join(sysroot, d[1:]) + f = os.path.join(d, "sqlite3.h") if os.path.exists(f): if sqlite_setup_debug: print "sqlite: found %s"%f incf = open(f).read()