diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:22:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:22:49 -0700 |
| commit | f01723aaa1dc6ab676073d27b8d471e29abae208 (patch) | |
| tree | fab4c67b602958b1f5f23613ffdd67cfee84847c | |
| parent | fc5894bc720596964f65f2f645752d4740dbb731 (diff) | |
| parent | c28facd216b501d41ca76f040d0ce7749075aba0 (diff) | |
| download | git-f01723aaa1dc6ab676073d27b8d471e29abae208.tar.gz | |
Merge branch 'ml/cygwin-updates'
The tip one does _not_ revert c869753e (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
| -rw-r--r-- | config.mak.uname | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config.mak.uname b/config.mak.uname index 7ac541e9eb..b45b910759 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -159,16 +159,17 @@ ifeq ($(uname_O),Cygwin) NO_SYMLINK_HEAD = YesPlease NO_IPV6 = YesPlease OLD_ICONV = UnfortunatelyYes + NO_THREAD_SAFE_PREAD = YesPlease + # There are conflicting reports about this. + # On some boxes NO_MMAP is needed, and not so elsewhere. + # Try commenting this out if you suspect MMAP is more efficient + NO_MMAP = YesPlease + else + NO_REGEX = UnfortunatelyYes endif - NO_THREAD_SAFE_PREAD = YesPlease NEEDS_LIBICONV = YesPlease NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes - NO_TRUSTABLE_FILEMODE = UnfortunatelyYes NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease - # There are conflicting reports about this. - # On some boxes NO_MMAP is needed, and not so elsewhere. - # Try commenting this out if you suspect MMAP is more efficient - NO_MMAP = YesPlease X = .exe COMPAT_OBJS += compat/cygwin.o UNRELIABLE_FSTAT = UnfortunatelyYes |