mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 10:11:21 +02:00
Code

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

Browse Source 
* rj/maint-simplify-cygwin-makefile:
  Makefile: merge two Cygwin configuration sections into one
This commit is contained in:
Junio C Hamano 2009-11-20 23:47:43 -08:00
commit 8102453318
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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 = ;