From 43f296c7c2a350de0c59a442e566c165420803e3 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 29 Sep 2013 20:14:11 -0400 Subject: From Bogdan Tenea: Check for 8.3 filenames on cygwin as well as win32 to make variant_dir work properly. --- src/CHANGES.txt | 3 +++ src/engine/SCons/Node/FS.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 9fa8985..50a27dc 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,9 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Bogdan Tenea: + - Check for 8.3 filenames on cygwin as well as win32 to make variant_dir work properly. + From Alexandre Feblot: - Make sure SharedLibrary depends on all dependent libs (by depending on SHLINKCOM) diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index f31ca83..4381697 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1841,7 +1841,7 @@ class Dir(Base): for entry in map(_my_normcase, entries): d[entry] = True self.on_disk_entries = d - if sys.platform == 'win32': + if sys.platform == 'win32' or sys.platform == 'cygwin': name = _my_normcase(name) result = d.get(name) if result is None: -- cgit v0.12