Skip to content

Commit f01723a

Browse files
committed
Merge branch 'ml/cygwin-updates'
The tip one does _not_ revert c869753 (Force core.filemode to false on Cygwin., 2006-12-30) on purpose, so that people can still retain the old behaviour if they wanted to. * ml/cygwin-updates: cygwin: stop forcing core.filemode=false Cygwin 1.7 supports mmap Cygwin 1.7 has thread-safe pread Cygwin 1.7 needs compat/regex
2 parents fc5894b + c28facd commit f01723a

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

config.mak.uname

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,17 @@ ifeq ($(uname_O),Cygwin)
159159
NO_SYMLINK_HEAD = YesPlease
160160
NO_IPV6 = YesPlease
161161
OLD_ICONV = UnfortunatelyYes
162+
NO_THREAD_SAFE_PREAD = YesPlease
163+
# There are conflicting reports about this.
164+
# On some boxes NO_MMAP is needed, and not so elsewhere.
165+
# Try commenting this out if you suspect MMAP is more efficient
166+
NO_MMAP = YesPlease
167+
else
168+
NO_REGEX = UnfortunatelyYes
162169
endif
163-
NO_THREAD_SAFE_PREAD = YesPlease
164170
NEEDS_LIBICONV = YesPlease
165171
NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
166-
NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
167172
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
168-
# There are conflicting reports about this.
169-
# On some boxes NO_MMAP is needed, and not so elsewhere.
170-
# Try commenting this out if you suspect MMAP is more efficient
171-
NO_MMAP = YesPlease
172173
X = .exe
173174
COMPAT_OBJS += compat/cygwin.o
174175
UNRELIABLE_FSTAT = UnfortunatelyYes

0 commit comments

Comments
 (0)