Merge branch 'rj/maint-cygwin-count-objects'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 25a977153c72c50a2ecb8ec1b9df6ebc4f181a40..5a0b3d4a7b7c352f73be60ec254cad768040ee60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -805,6 +805,7 @@ ifeq ($(uname_O),Cygwin)
        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
        NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
        OLD_ICONV = 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
@@ -982,7 +983,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
        NEEDS_CRYPTO_WITH_SSL = YesPlease
        NO_LIBGEN_H = YesPlease
        NO_SYMLINK_HEAD = YesPlease
-       NO_IPV6 = YesPlease
        NO_SETENV = YesPlease
        NO_UNSETENV = YesPlease
        NO_STRCASESTR = YesPlease