From: Ned Deily <nad@acm.org>
Date: Sun, 5 Aug 2012 21:56:21 +0000 (-0700)
Subject: Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
X-Git-Tag: v3.3.0b2~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03e2180b3f5c8fbbbf26e8ffc168ddf6269aba02;p=thirdparty%2FPython%2Fcpython.git

Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index c431474a0fe7..ed4fa871c6ae 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -440,6 +440,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 #14197: For OS X framework builds, ensure links to the shared
diff --git a/setup.py b/setup.py
index f3886bf43762..65acb99f7c17 100644
--- a/setup.py
+++ b/setup.py
@@ -981,12 +981,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)
                 with open(f) as file: