| Index: third_party/scons/scons-local/SCons/Builder.py
|
| ===================================================================
|
| --- third_party/scons/scons-local/SCons/Builder.py (revision 7505)
|
| +++ third_party/scons/scons-local/SCons/Builder.py (working copy)
|
| @@ -98,7 +98,7 @@
|
| # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
| #
|
|
|
| -__revision__ = "src/engine/SCons/Builder.py 3603 2008/10/10 05:46:45 scons"
|
| +__revision__ = "src/engine/SCons/Builder.py 3842 2008/12/20 22:59:52 scons"
|
|
|
| import UserDict
|
| import UserList
|
| @@ -232,7 +232,7 @@
|
| if kw.has_key('generator'):
|
| if kw.has_key('action'):
|
| raise UserError, "You must not specify both an action and a generator."
|
| - kw['action'] = SCons.Action.CommandGeneratorAction(kw['generator'])
|
| + kw['action'] = SCons.Action.CommandGeneratorAction(kw['generator'], {})
|
| del kw['generator']
|
| elif kw.has_key('action'):
|
| source_ext_match = kw.get('source_ext_match', 1)
|
| @@ -240,7 +240,7 @@
|
| del kw['source_ext_match']
|
| if SCons.Util.is_Dict(kw['action']):
|
| composite = DictCmdGenerator(kw['action'], source_ext_match)
|
| - kw['action'] = SCons.Action.CommandGeneratorAction(composite)
|
| + kw['action'] = SCons.Action.CommandGeneratorAction(composite, {})
|
| kw['src_suffix'] = composite.src_suffixes()
|
| else:
|
| kw['action'] = SCons.Action.Action(kw['action'])
|
|
|