From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:46 +0000 (-0700)
Subject: Merge branch 'sk/msvc-dynlink-crt'
X-Git-Tag: v2.1.0-rc0~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14ce98d7e9f4cb84bc7edd41bd29abf0fa901490;p=thirdparty%2Fgit.git

Merge branch 'sk/msvc-dynlink-crt'

* sk/msvc-dynlink-crt:
  MSVC: link dynamically to the CRT
---

14ce98d7e9f4cb84bc7edd41bd29abf0fa901490
diff --cc config.mak.uname
index f2a4d6353c,4a68c24eb2..1ae675b053
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -362,8 -357,8 +362,8 @@@ ifeq ($(uname_S),Windows
  	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o
 -	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 +	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
- 	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
+ 	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
  	EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
  	PTHREAD_LIBS =
  	lib =