Fix spurious rebuilds/reinstalls of header files and circular dependencies with generated header files by allowing Scanners to be associated explicitly with Builders, not just through Scanner file suffix lists.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index db4e375..196b426 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -155,6 +155,17 @@ class SConf:
                 already_done.append( n )
             self._setCache(n.children())
 
+            # Calling children() has set up the implicit cache (and
+            # other state), but we're not really building things yet,
+            # so generated files won't have been generated.  Clear the
+            # state so we will, in fact, build everything that's necessary
+            # when we do the build.
+            #
+            # XXX - it would be good to find a better way to do this,
+            # maybe by doing something with the actions in the actual
+            # Taskmaster...?
+            n.clear()
+
     def BuildNodes(self, nodes):
         """
         Tries to build the given nodes immediately. Returns 1 on success,