mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* rj/maint-simplify-cygwin-makefile:
  Makefile: merge two Cygwin configuration sections into one
This commit is contained in:
Junio C Hamano
2009-12-03 13:51:16 -08:00
parent dc733ef419 035b76b03f
commit c206224b2b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -787,6 +787,8 @@ ifeq ($(uname_O),Cygwin)
NO_MMAP = YesPlease NO_MMAP = YesPlease
NO_IPV6 = YesPlease NO_IPV6 = YesPlease
X = .exe X = .exe
COMPAT_OBJS += compat/cygwin.o
UNRELIABLE_FSTAT = UnfortunatelyYes
endif endif
ifeq ($(uname_S),FreeBSD) ifeq ($(uname_S),FreeBSD)
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease
@ -896,10 +898,6 @@ ifeq ($(uname_S),HP-UX)
NO_SYS_SELECT_H = YesPlease NO_SYS_SELECT_H = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease
endif endif
ifneq (,$(findstring CYGWIN,$(uname_S)))
COMPAT_OBJS += compat/cygwin.o
UNRELIABLE_FSTAT = UnfortunatelyYes
endif
ifdef MSVC ifdef MSVC
GIT_VERSION := $(GIT_VERSION).MSVC GIT_VERSION := $(GIT_VERSION).MSVC
pathsep = ; pathsep = ;