From: Ned Deily <nad@acm.org>
Date: Mon, 30 Jul 2012 11:07:49 +0000 (-0700)
Subject: Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
X-Git-Tag: v2.7.4rc1~676
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8ec464dbbf4513c26018ca2825ea1498fe0aa71;p=thirdparty%2FPython%2Fcpython.git

Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index dcba56a5356a..78cc0384c4de 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -309,6 +309,8 @@ Tests
 Build
 -----
 
+- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
+
 - Issue #8767: Restore building with --disable-unicode.
   Patch by Stefano Taschini.
 
diff --git a/setup.py b/setup.py
index a939b73eda44..6dd0422499d9 100644
--- a/setup.py
+++ b/setup.py
@@ -48,6 +48,9 @@ def is_macosx_sdk_path(path):
     Returns True if 'path' can be located in an OSX SDK
     """
     return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
+    return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
+                or path.startswith('/System/')
+                or path.startswith('/Library/') )
 
 def find_file(filename, std_dirs, paths):
     """Searches for the directory where a given file is located,