Have scons fully evaluate order-only prequisites Nodes before evaluating...

third_party/scons/scons-local/SCons/Taskmaster.py

 #
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
@@ skipping 771 matching lines @@
                 self.ready_exc = sys.exc_info()
                 if S: S.problem = S.problem + 1
                 if T: T.write(self.trace_message('       exception %s while scanning children.\n' % e))
                 return node
 
             children_not_visited = []
             children_pending = set()
             children_not_ready = []
             children_failed = False
 
-            for child in chain(children, executor.get_all_prerequisites()):
+            #TODO(sgk)
+            # Evaluate order-only prerequisites before any "direct" children
+            # (sources and dependencies) are evaluated.  This is in advance
+            # of a change that will be incorporated in the next upstream
+            # version of SCons, per:
+            #   http://scons.tigris.org/issues/show_bug.cgi?id=2372
+            #TODO(sgk) - FROM THIS:
+            #for child in chain(children, executor.get_all_prerequisites()):
+            #TODO(sgk) - TO THIS:
+            for child in chain(executor.get_all_prerequisites(), children):
+            #TODO(sgk) - END CHANGES.
                 childstate = child.get_state()
 
                 if T: T.write(self.trace_message('       ' + self.trace_node(child)))
 
                 if childstate == NODE_NO_STATE:
                     children_not_visited.append(child)
                 elif childstate == NODE_PENDING:
                     children_pending.add(child)
                 elif childstate == NODE_FAILED:
                     children_failed = True
@@ skipping 204 matching lines @@
         desc = 'Found dependency cycle(s):\n'
         for node, cycle in nclist:
             if cycle:
                 desc = desc + "  " + string.join(map(str, cycle), " -> ") + "\n"
             else:
                 desc = desc + \
                     "  Internal Error: no cycle found for node %s (%s) in state %s\n" %  \
                     (node, repr(node), StateString[node.get_state()])
 
         raise SCons.Errors.UserError, desc