[Python-checkins] cpython (merge 3.3 -> default): Ensure setup.py looks for zlib.h in an OS X SDK.

[ned.deily]

http://hg.python.org/cpython/rev/f3a2dab1623b
changeset:   86464:f3a2dab1623b
parent:      86461:5e385dcfbd32
parent:      86463:2d8d5fea6194
user:        Ned Deily <nad at acm.org>
date:        Fri Oct 18 21:34:58 2013 -0700
summary:
  Ensure setup.py looks for zlib.h in an OS X SDK.

files:
  setup.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1326,6 +1326,8 @@
             zlib_h = zlib_inc[0] + '/zlib.h'
             version = '"0.0.0"'
             version_req = '"1.1.3"'
+            if host_platform == 'darwin' and is_macosx_sdk_path(zlib_h):
+                zlib_h = os.path.join(macosx_sdk_root(), zlib_h[1:])
             with open(zlib_h) as fp:
                 while 1:
                     line = fp.readline()

-- 
Repository URL: http://hg.python.org/cpython