summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-19 00:58:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-19 00:58:51 (GMT)
commit52b6536c624b4998b3730b55b9bc3d7c4e1071a4 (patch)
tree0d74002e3bf00e8350dcdec75d8b01a6f59e8b65 /Makefile
parent6eb668df76a5b46bd24c25d227bfdba12542b05a (diff)
parent0b4276931f4130e93f393cb8b9fa0ce2138f1d9c (diff)
downloadgit-52b6536c624b4998b3730b55b9bc3d7c4e1071a4.zip
git-52b6536c624b4998b3730b55b9bc3d7c4e1071a4.tar.gz
git-52b6536c624b4998b3730b55b9bc3d7c4e1071a4.tar.bz2
Merge branch 'master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 819c48c..2d8853d 100644
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,10 @@ endif
ifeq ($(uname_O),Cygwin)
NO_STRCASESTR = YesPlease
NEEDS_LIBICONV = YesPlease
+ # There are conflicting reports about this.
+ # On some boxes NO_MMAP is needed, and not so elsewhere.
+ # Try uncommenting this if you see things break -- YMMV.
+ # NO_MMAP = YesPlease
NO_IPV6 = YesPlease
X = .exe
ALL_CFLAGS += -DUSE_SYMLINK_HEAD=0