Patched the new version of SCons to work around a Mac+Python+Toolchain bug.

scons-2.0.1/script/scons

Index: scons-2.0.1/script/scons
===================================================================
--- scons-2.0.1/script/scons	(revision 4663)
+++ scons-2.0.1/script/scons	(working copy)
@@ -161,7 +161,17 @@
 
     try:
         import pkg_resources
-    except ImportError:
+    # BEGIN MODIFICATION
+    # It is known that importing pkg_resources can result in:
+    # An ImportError

[Mark Seaborn, 2011/03/30 20:07:14]

add "or" on the end?

+    # A distutils.errors.DistutilsPlatformError

[Mark Seaborn, 2011/03/30 20:07:14]

You told me that this is considered a Python bug which is fixed upstream in a
newer Python.  Could you link to that here?

+    # Vanila SCons only catches an ImportError.

[Mark Seaborn, 2011/03/30 20:07:14]

"vanilla"

+    # The other exception gets throw on the mac toolchain bot because it

[Mark Seaborn, 2011/03/30 20:07:14]

mac -> Mac

+    # sets MACOSX_DEPLOYMENT_TARGET to an older version.
+    # In practice, it doesn't matter why importing pkg_resources fails, so
+    # it's reasonable to catch every exception.
+    except Exception:
+    # END MODIFICATION
         pass
     else:
         # when running from an egg add the egg's directory