Fix ListBuilder so it works with --implicit-cache. (Anthony Roach)

1 files changed, 3 insertions, 12 deletions

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index bb68c93..42c9484 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -342,10 +342,7 @@ class ListBuilder:
 
     def __init__(self, builder, env, tlist):
         self.builder = builder
-        self.scanner = builder.scanner
-        self.env = env
 	self.tlist = tlist
-        self.multi = builder.multi
         self.name = "ListBuilder(%s)"%builder.name
 
     def execute(self, **kw):
@@ -362,15 +359,6 @@ class ListBuilder:
                 t.build()
         return self.status
 
-    def get_raw_contents(self, **kw):
-        return apply(self.builder.get_raw_contents, (), kw)
-
-    def get_contents(self, **kw):
-        return apply(self.builder.get_contents, (), kw)
-
-    def src_suffixes(self, env, args):
-        return self.builder.src_suffixes(env, args)
-
     def targets(self, node):
         """Return the list of targets for this builder instance.
         """
@@ -379,6 +367,9 @@ class ListBuilder:
     def __cmp__(self, other):
 	return cmp(self.__dict__, other.__dict__)
 
+    def __getattr__(self, name):
+	return getattr(self.builder, name)
+
 class MultiStepBuilder(BuilderBase):
     """This is a builder subclass that can build targets in
     multiple steps.  The src_builder parameter to the constructor