From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Oct 2009 07:02:23 +0000 (-0700)
Subject: Merge branch 'ms/msvc'
X-Git-Tag: v1.6.5~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ba5effa26707fdc5b8a3b10f0fdd3007f657b64?ds=inline;hp=-c

Merge branch 'ms/msvc'

* ms/msvc:
Fix the exit code of MSVC build scripts on cygwin
Fix MSVC build on cygwin
---

8ba5effa26707fdc5b8a3b10f0fdd3007f657b64
diff --combined Makefile
index 532be9dd9a,ae9bb03382..629ab35047
--- a/Makefile
+++ b/Makefile
@@@ -734,7 -734,6 +734,7 @@@ ifeq ($(uname_S),SunOS
  	NO_MKSTEMPS = YesPlease
  	NO_REGEX = YesPlease
  	NO_EXTERNAL_GREP = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  	ifeq ($(uname_R),5.7)
  		NEEDS_RESOLV = YesPlease
  		NO_IPV6 = YesPlease
@@@ -841,18 -840,11 +841,18 @@@ ifeq ($(uname_S),IRIX
  	NO_MEMMEM = YesPlease
  	NO_MKSTEMPS = YesPlease
  	NO_MKDTEMP = YesPlease
 +	# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads
 +	# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),
 +	# git dies with a segmentation fault when trying to access the first
 +	# entry of a reflog.  The conservative choice is made to always set
 +	# NO_MMAP.  If you suspect that your compiler is not affected by this
 +	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_EXTERNAL_GREP = UnfortunatelyYes
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),IRIX64)
  	NO_SETENV=YesPlease
@@@ -861,18 -853,11 +861,18 @@@
  	NO_MEMMEM = YesPlease
  	NO_MKSTEMPS = YesPlease
  	NO_MKDTEMP = YesPlease
 +	# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads
 +	# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),
 +	# git dies with a segmentation fault when trying to access the first
 +	# entry of a reflog.  The conservative choice is made to always set
 +	# NO_MMAP.  If you suspect that your compiler is not affected by this
 +	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_EXTERNAL_GREP = UnfortunatelyYes
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH=/usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),HP-UX)
  	NO_IPV6=YesPlease
@@@ -929,7 -914,7 +929,7 @@@ ifdef MSV
  	CC = compat/vcbuild/scripts/clink.pl
  	AR = compat/vcbuild/scripts/lib.pl
  	CFLAGS =
- 	BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32-D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
+ 	BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
  	COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o
  	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -DSTRIP_EXTENSION=\".exe\"
  	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib