Makefile: merge two Cygwin configuration sections into one
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Oct 27, 2009 at 19:11 UTC
035b76b03f63e077e3465a99bee5dffa29822344
1 file changed
+2
-4
Makefile
+2
-4
@@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
782
NO_MMAP = YesPlease
783
NO_IPV6 = YesPlease
784
X = .exe
785
+ COMPAT_OBJS += compat/cygwin.o
786
+ UNRELIABLE_FSTAT = UnfortunatelyYes
787
endif
788
ifeq ($(uname_S),FreeBSD)
789
NEEDS_LIBICONV = YesPlease
@@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
893
NO_SYS_SELECT_H = YesPlease
894
SNPRINTF_RETURNS_BOGUS = YesPlease
895
endif
894
-ifneq (,$(findstring CYGWIN,$(uname_S)))
895
- COMPAT_OBJS += compat/cygwin.o
896
- UNRELIABLE_FSTAT = UnfortunatelyYes
897
-endif
896
ifdef MSVC
897
GIT_VERSION := $(GIT_VERSION).MSVC
898
pathsep = ;