traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Ned Deily 2012-08-05 14:42:45 -07:00
parent 947f358a06
commit 670280470d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -327,6 +327,8 @@ Tests
Build Build
----- -----
- Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
- Issue #8847: Disable COMDAT folding in Windows PGO builds. - Issue #8847: Disable COMDAT folding in Windows PGO builds.
- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. - Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.

8
setup.py
View File

@ -1028,12 +1028,12 @@ class PyBuildExt(build_ext):
if sys.platform == 'darwin': if sys.platform == 'darwin':
sysroot = macosx_sdk_root() sysroot = macosx_sdk_root()
for d in inc_dirs + sqlite_inc_paths: for d_ in inc_dirs + sqlite_inc_paths:
f = os.path.join(d, "sqlite3.h") d = d_
if sys.platform == 'darwin' and is_macosx_sdk_path(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 os.path.exists(f):
if sqlite_setup_debug: print "sqlite: found %s"%f if sqlite_setup_debug: print "sqlite: found %s"%f
incf = open(f).read() incf = open(f).read()