Restore older recipe for creating env.Command() builders while a better solution is coded.

2 files changed, 2 insertions, 13 deletions

diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index d973a01..ca543bd 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -1141,12 +1141,8 @@ class Base:
         source files using the supplied action.  Action may
         be any type that the Builder constructor will accept
         for an action."""
-        builder_kw = {
-            'action' : action,
-            'source_factory' : self.fs.Entry,
-        }
-        builder_kw.update(kw)
-        bld = apply(SCons.Builder.Builder, (), builder_kw)
+        bld = SCons.Builder.Builder(action = action,
+                                    source_factory = self.fs.Entry)
         return apply(bld, (self, target, source), kw)
 
     def Depends(self, target, dependency):
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 56c42cb..71383e7 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -2001,13 +2001,6 @@ f5: \
         assert str(t) == 'xxx.out', str(t)
         assert 'xxx.in' in map(lambda x: x.path, t.sources)
 
-        # Make sure we can use Builder keyword arguments
-        # on Command() calls.
-        env.Command(target='mmm.out', source='mmm.1.in',
-                    action='multibuild', multi=1)
-        env.Command(target='mmm.out', source='mmm.2.in',
-                    action='multibuild', multi=1)
-
     def test_Configure(self):
         """Test the Configure() method"""
         # Configure() will write to a local temporary file.