Get the source_scanner from the target node, not the source node. (Kevin Quick)

3 files changed, 9 insertions, 6 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8e761e9..4780aed 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -151,6 +151,9 @@ RELEASE 0.97 - XXX
   - Don't retrieve files from a CacheDir, but report what would happen,
     when the -n option is used.
 
+  - Use the source_scanner from the target Node, not the source node
+    itself.
+
   From Christoph Wiedemann:
 
   - Add an Environment.SetDefault() method that only sets values if
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 138b00b..e380318 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -709,8 +709,8 @@ class NodeTestCase(unittest.TestCase):
         s = target.get_source_scanner(source)
         assert s is ts1, s
 
-        source.builder = Builder()
-        source.builder.source_scanner = ts2
+        target.builder = Builder()
+        target.builder.source_scanner = ts2
         s = target.get_source_scanner(source)
         assert s is ts2, s
 
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 47139fc..6e7379c 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -376,7 +376,7 @@ class Node:
         """
         Turn a cache implicit dependency path into a node.
         This is called so many times that doing caching
-        here is a significant perforamnce boost.
+        here is a significant performance boost.
         """
         try:
             return self.implicit_factory_cache[path]
@@ -394,7 +394,7 @@ class Node:
         if self.source_scanner:
             return self.source_scanner
         try:
-            scanner = node.builder.source_scanner
+            scanner = self.builder.source_scanner
             if scanner:
                 return scanner
         except AttributeError:
@@ -789,7 +789,7 @@ class Node:
         if self.is_derived() and self.env:
             env = self.get_build_env()
             for s in self.sources:
-                scanner = s.get_source_scanner(self)
+                scanner = self.get_source_scanner(s)
                 def f(node, env=env, scanner=scanner, target=self):
                     return node.get_found_includes(env, scanner, target)
                 return SCons.Util.render_tree(s, f, 1)
@@ -827,7 +827,7 @@ class Node:
         generator is being called to generate a signature for the
         command line, which determines if we should rebuild or not.
 
-        Such command generators shoud use this method in preference
+        Such command generators should use this method in preference
         to str(Node) when converting a Node to a string, passing
         in the for_signature parameter, such that we will call
         Node.for_signature() or str(Node) properly, depending on whether