]> granicus.if.org Git - python/commitdiff
Issue #14018: fix merge error
authorNed Deily <nad@acm.org>
Sun, 27 Jan 2013 02:09:12 +0000 (18:09 -0800)
committerNed Deily <nad@acm.org>
Sun, 27 Jan 2013 02:09:12 +0000 (18:09 -0800)
setup.py

index 0dea9248e6f4c6f19368e79540d811fcd633e1eb..87dcf59a98900949e06161bfaa036c454e20eafe 100644 (file)
--- 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/') )