Make case differences not effect #include order. (Anthony Roach)

2 files changed, 10 insertions, 2 deletions

diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index f871551..d12fd45 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -129,7 +129,11 @@ def scan(node, env, target, fs = SCons.Node.FS.default_fs):
                 return map(stripit, paired)
     
             def normalize(node):
-                return str(node)
+                # We don't want the order of includes to be 
+                # modified by case changes on case insensitive OSes, so
+                # normalize the case of the filename here:
+                # (see test/win32pathmadness.py for a test of this)
+                return SCons.Node.FS._my_normcase(str(node))
 
             node.found_includes[cpppath] = st(nodes, normalize)
 
diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py
index 954510a..5e0d6d3 100644
--- a/src/engine/SCons/Scanner/Fortran.py
+++ b/src/engine/SCons/Scanner/Fortran.py
@@ -126,6 +126,10 @@ def scan(node, env, target, fs = SCons.Node.FS.default_fs):
         return map(stripit, paired)
 
     def normalize(node):
-        return str(node)
+        # We don't want the order of includes to be 
+        # modified by case changes on case insensitive OSes, so
+        # normalize the case of the filename here:
+        # (see test/win32pathmadness.py for a test of this)
+        return SCons.Node.FS._my_normcase(str(node))
 
     return st(nodes, normalize)