Make the C Scanner always return the dependencies sorted, so order differences don't cause unnecessary rebuilds.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index 2c51223..58d065b 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -118,5 +118,18 @@ def scan(node, env, args = [SCons.Node.FS.default_fs, ()]):
             if not node is None:
                 nodes.append(node)
 
-    return nodes
+    # Schwartzian transform from the Python FAQ Wizard
+    def st(List, Metric):
+        def pairing(element, M = Metric):
+            return (M(element), element)
+        def stripit(pair):
+            return pair[1]
+        paired = map(pairing, List)
+        paired.sort()
+        return map(stripit, paired)
+
+    def normalize(node):
+        return os.path.normpath(str(node))
+
+    return st(nodes, normalize)