Work around Cygwin Python's broken idea that it's case-sensitive. (Chad Austin)

2 files changed, 7 insertions, 1 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 2b598ae..4d0ad9a 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -28,6 +28,9 @@ RELEASE 0.95 - XXX
   - Add support for a "toolpath" Tool() and Environment keyword that
     allows Tool modules to be found in specified local directories.
 
+  - Work around Cygwin Python's silly fiction that it's using a
+    case-sensitive file system.
+
   From Chris Burghart:
 
   - Fix the ability to save/restore a PackageOption to a file.
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 45809f9..7c4b383 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -41,6 +41,7 @@ import os.path
 import shutil
 import stat
 import string
+import sys
 import cStringIO
 
 import SCons.Action
@@ -218,7 +219,9 @@ class ParentOfRoot:
     def src_builder(self):
         return _null
 
-if os.path.normcase("TeSt") == os.path.normpath("TeSt"):
+# Cygwin's os.path.normcase pretends it's on a case-sensitive filesystem.
+_is_cygwin = sys.platform == "cygwin"
+if os.path.normcase("TeSt") == os.path.normpath("TeSt") and not _is_cygwin:
     def _my_normcase(x):
         return x
 else: