diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-21 07:47:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-21 07:47:43 (GMT) |
| commit | 8102453318caf731ec0fdfa8d9f744a0ac9a44ef (patch) | |
| tree | 4ccc28959ca231dffb862f14dcafda2fba9ed9c1 /Makefile | |
| parent | 1a02a85d63f280ffaec6977ed2365be92cb80287 (diff) | |
| parent | 035b76b03f63e077e3465a99bee5dffa29822344 (diff) | |
| download | git-8102453318caf731ec0fdfa8d9f744a0ac9a44ef.zip git-8102453318caf731ec0fdfa8d9f744a0ac9a44ef.tar.gz git-8102453318caf731ec0fdfa8d9f744a0ac9a44ef.tar.bz2 | |
Merge branch 'rj/maint-simplify-cygwin-makefile'
* rj/maint-simplify-cygwin-makefile:
Makefile: merge two Cygwin configuration sections into one
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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 = ; |