From: Ned Deily <nad@acm.org>
Date: Sun, 27 Jan 2013 02:09:12 +0000 (-0800)
Subject: Issue #14018: fix merge error
X-Git-Tag: v3.2.4rc1~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8916b853b9331f2ad51df4fcfd5d3fc528c1e195;p=thirdparty%2FPython%2Fcpython.git

Issue #14018: fix merge error
---

diff --git a/setup.py b/setup.py
index 0dea9248e6f4..87dcf59a9890 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,6 @@ 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/') )