From: Ned Deily <nad@acm.org>
Date: Mon, 30 Jul 2012 11:09:32 +0000 (-0700)
Subject: Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
X-Git-Tag: v3.3.0b2~75^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b796680c3cbc1d43f3e1157cacc8e6b668f65f6;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 1b3d24405c..5ede32413d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -435,6 +435,8 @@ Build
 - Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.
   Based on patch from Hervé Coatanhay.
 
+- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
+
 Documentation
 -------------
 
diff --git a/setup.py b/setup.py
index 2539f50fa8..f3886bf437 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,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,