summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-08-05 21:56:21 (GMT)
committerNed Deily <nad@acm.org>2012-08-05 21:56:21 (GMT)
commit03e2180b3f5c8fbbbf26e8ffc168ddf6269aba02 (patch)
tree7a21b7f81229476b8d2ead2e099abc129375cba3
parente768c39890a3071219d02b1b49e957d58b6410a3 (diff)
downloadcpython-03e2180b3f5c8fbbbf26e8ffc168ddf6269aba02.zip
cpython-03e2180b3f5c8fbbbf26e8ffc168ddf6269aba02.tar.gz
cpython-03e2180b3f5c8fbbbf26e8ffc168ddf6269aba02.tar.bz2
Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
-rw-r--r--Misc/NEWS2
-rw-r--r--setup.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c431474..ed4fa87 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 f3886bf..65acb99 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: