diff options
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 7fcdf77..7ae7f21 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -37,6 +37,7 @@ import SCons.Errors import SCons.Node import SCons.Node.FS import SCons.Platform +import SCons.Tool import SCons.Util import os @@ -273,5 +274,6 @@ def BuildDefaultGlobals(): globals['SConscriptChdir'] = SConscriptChdir globals['SetCommandHandler'] = SCons.Action.SetCommandHandler globals['Split'] = SCons.Util.Split + globals['Tool'] = SCons.Tool.Tool globals['WhereIs'] = SCons.Util.WhereIs return globals diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 3471190..c43f1ab 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -99,6 +99,7 @@ class BuildTask(SCons.Taskmaster.Task): # We aren't being called out of a user frame, so # don't try to walk the stack, just print the error. sys.stderr.write("\nSCons error: %s\n" % e) + raise except: sys.stderr.write("scons: *** %s\n" % sys.exc_value) raise @@ -982,6 +983,8 @@ def _main(): SCons.Sig.write() def main(): + global exit_status + try: _main() except SystemExit: |