Anonymous committed fcce817

[svn r82272] Two small fixes for the support for SDKs on MacOSX:

1) The code that checks if an path should be located in the SDK
explicitly excludes /usr/local. This fixes issue9046

2) The SDK variant for filtering "db_dirs_to_check" in
was not doing anything because of a missing assignment.

  • Participants
  • Parent commits 52f4ea3

Comments (0)

Files changed (1)


   * link shared library handled by 'cc -shared'
-__revision__ = "$Id: 81662 2010-06-03 09:47:21Z ronald.oussoren $"
+__revision__ = "$Id: 82272 2010-06-27 12:36:16Z ronald.oussoren $"
 import os, sys, re
 from types import StringType, NoneType
             static = os.path.join(dir, static_f)
             if sys.platform == 'darwin' and (
-                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                dir.startswith('/System/') or (
+                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)