Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1548)

Unified Diff: scons-2.0.1/script/scons

Issue 6731096: Patched the new version of SCons to work around a Mac+Python+Toolchain bug. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/third_party/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scons-2.0.1/README.nacl ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,18 @@
try:
import pkg_resources
- except ImportError:
+ # BEGIN MODIFICATION
+ # It is known that importing pkg_resources can result in:
+ # An ImportError or
+ # A distutils.errors.DistutilsPlatformError
+ # (See: http://bugs.python.org/issue9516)
+ # The upstream version of SCons only catches an ImportError.
+ # The other exception gets throw on the Mac toolchain bot because it
+ # 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
« no previous file with comments | « scons-2.0.1/README.nacl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698