diff options
| author | Steven Knight <knight@baldmt.com> | 2002-06-15 04:53:49 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-06-15 04:53:49 (GMT) |
| commit | 77d43537975b406379979d599894971bf4a225f2 (patch) | |
| tree | 93c8e6987a60b53f5ca0e3bc986bdcb4208893f3 /src/engine/SCons/Script | |
| parent | cef5b7fa735eb4e405fab5f852df8e7d53c76954 (diff) | |
| download | SCons-77d43537975b406379979d599894971bf4a225f2.zip SCons-77d43537975b406379979d599894971bf4a225f2.tar.gz SCons-77d43537975b406379979d599894971bf4a225f2.tar.bz2 | |
Add LIBS and LIBPATH dependencies for shared libraries. (Charles Crain)
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 44ec7ce..7fcdf77 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -259,8 +259,12 @@ def BuildDefaultGlobals(): globals['GetCommandHandler'] = SCons.Action.GetCommandHandler globals['Help'] = Help globals['Import'] = Import - globals['Library'] = SCons.Defaults.Library - globals['Object'] = SCons.Defaults.Object + globals['Library'] = SCons.Defaults.StaticLibrary + globals['Object'] = SCons.Defaults.StaticObject + globals['StaticLibrary'] = SCons.Defaults.StaticLibrary + globals['StaticObject'] = SCons.Defaults.StaticObject + globals['SharedLibrary'] = SCons.Defaults.SharedLibrary + globals['SharedObject'] = SCons.Defaults.SharedObject globals['Platform'] = SCons.Platform.Platform globals['Program'] = SCons.Defaults.Program globals['Return'] = Return diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 89d26b2..879f6d1 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -93,6 +93,10 @@ class BuildTask(SCons.Taskmaster.Task): traceback.print_exception(e.args[0], e.args[1], e.args[2]) raise + except UserError, e: + # 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) except: sys.stderr.write("scons: *** %s\n" % sys.exc_value) raise |