Eliminate Executor's creation and use of a build_dict and a subst_dict, which were creating a separate OverrideEnvironment for every target and foiling the Memoizer's attempts at speeding up things.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 1f2b0a8..50e3818 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1397,13 +1397,6 @@ class File(Base):
         return self.fs.Rsearchall(pathlist, clazz=Dir, must_exist=0,
                                   cwd=self.cwd)
 
-    def generate_build_dict(self):
-        """Return an appropriate dictionary of values for building
-        this File."""
-        return {'Dir' : self.Dir,
-                'File' : self.File,
-                'RDirs' : self.RDirs}
-
     def _morph(self):
         """Turn a file system node into a File object.  __cache_reset__"""
         self.scanner_paths = {}
@@ -1480,10 +1473,10 @@ class File(Base):
             try:
                 path = self.scanner_paths[scanner]
             except KeyError:
-                path = scanner.path(env, self.cwd)
+                path = scanner.path(env, self.cwd, target)
                 self.scanner_paths[scanner] = path
         except KeyError:
-            path = scanner.path(env, target.cwd)
+            path = scanner.path(env, target.cwd, target)
             target.scanner_paths[scanner] = path
 
         return scanner(self, env, path)