Merge branch 'rj/maint-simplify-cygwin-makefile'

* rj/maint-simplify-cygwin-makefile:
  Makefile: merge two Cygwin configuration sections into one

diff --git a/Makefile b/Makefile
index d045223837ebd79426572d4bac53450910ae5ab6..7b8d11d118c7b17213014caee4b50a3d0ce19995 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -789,6 +789,8 @@ ifeq ($(uname_O),Cygwin)
        NO_MMAP = YesPlease
        NO_IPV6 = YesPlease
        X = .exe
+       COMPAT_OBJS += compat/cygwin.o
+       UNRELIABLE_FSTAT = UnfortunatelyYes
 endif
 ifeq ($(uname_S),FreeBSD)
        NEEDS_LIBICONV = YesPlease
@@ -898,10 +900,6 @@ ifeq ($(uname_S),HP-UX)
        NO_SYS_SELECT_H = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
 endif
-ifneq (,$(findstring CYGWIN,$(uname_S)))
-       COMPAT_OBJS += compat/cygwin.o
-       UNRELIABLE_FSTAT = UnfortunatelyYes
-endif
 ifdef MSVC
        GIT_VERSION := $(GIT_VERSION).MSVC
        pathsep = ;