Index: third_party/scons/scons-local/SCons/Tool/link.py |
=================================================================== |
--- third_party/scons/scons-local/SCons/Tool/link.py (revision 9094) |
+++ third_party/scons/scons-local/SCons/Tool/link.py (working copy) |
@@ -9,7 +9,7 @@ |
""" |
# |
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation |
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation |
# |
# Permission is hereby granted, free of charge, to any person obtaining |
# a copy of this software and associated documentation files (the |
@@ -31,7 +31,7 @@ |
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
# |
-__revision__ = "src/engine/SCons/Tool/link.py 3842 2008/12/20 22:59:52 scons" |
+__revision__ = "src/engine/SCons/Tool/link.py 3897 2009/01/13 06:45:54 scons" |
import SCons.Defaults |
import SCons.Tool |
@@ -99,10 +99,13 @@ |
# setting them the same means that LoadableModule works everywhere. |
SCons.Tool.createLoadableModuleBuilder(env) |
env['LDMODULE'] = '$SHLINK' |
+ # don't set up the emitter, cause AppendUnique will generate a list |
+ # starting with None :-( |
+ env.Append(LDMODULEEMITTER='$SHLIBEMITTER') |
env['LDMODULEPREFIX'] = '$SHLIBPREFIX' |
env['LDMODULESUFFIX'] = '$SHLIBSUFFIX' |
env['LDMODULEFLAGS'] = '$SHLINKFLAGS' |
- env['LDMODULECOM'] = '$SHLINKCOM' |
+ env['LDMODULECOM'] = '$LDMODULE -o $TARGET $LDMODULEFLAGS $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' |