From: Ned Deily <nad@acm.org>
Date: Sun, 27 Jan 2013 02:08:22 +0000 (-0800)
Subject: Issue #14018: fix merge error
X-Git-Tag: v2.7.4rc1~200
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4511e276d57f2ff1a902e3f5ef8a24103292e7db;p=thirdparty%2FPython%2Fcpython.git

Issue #14018: fix merge error
---

diff --git a/setup.py b/setup.py
index 1791fbe2821a..6a503c068296 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,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/') )