diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:51:16 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:51:16 +0300 |
| commit | c206224b2b7a32924c40b162c59329da143aba1f (patch) | |
| tree | 7a50318317f150f045727d5703677e59c7c305fe | |
| parent | dc733ef4190dffcbcd5c1c27569fecf01f9a44bd (diff) | |
| parent | 035b76b03f63e077e3465a99bee5dffa29822344 (diff) | |
Merge branch 'rj/maint-simplify-cygwin-makefile' into maint
* rj/maint-simplify-cygwin-makefile:
Makefile: merge two Cygwin configuration sections into one
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -787,6 +787,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 @@ -896,10 +898,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 = ; |