2 files changed, 15 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 033a73b51d0..88c633c8c39 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-20  Jason Rumney  <jasonr@gnu.org>
+
+        * gmake.defs (CYGWIN) [USING_SH]: Disable mapping of file
+        permissions to NTFS ACLs.
+
 2007-10-20  Eli Zaretskii  <eliz@gnu.org>
 
         * configure.bat (docflags, doldflags): New variables.
diff --git a/nt/gmake.defs b/nt/gmake.defs
index e782c203e76..6bc5e247886 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -99,6 +99,16 @@ sh_output := $(shell echo foo")
 ifeq "$(sh_output)" ""
 NEW_CYGWIN = 1
 endif
+
+# By default, newer versions of Cygwin mess with NTFS ACLs in an
+# attempt to emulate traditional posix file permissions. This can
+# cause bad effects, such as .exe files that are missing the
+# FILE_EXECUTE/FILE_GENERIC_EXECUTE permissions when they are created
+# with Cygwin commands that don't expect to be creating executable
+# files. Then when we later use a non-Cygwin program to create the
+# real .exe, the previous Cygwin defined ACL sticks.
+CYGWIN=nontsec
+export CYGWIN
 endif
 
 ALL_DEPS        = $^