diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 11:59:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 11:59:46 -0700 |
| commit | 48ae20513ddde38121cc89be58580a5970c813ef (patch) | |
| tree | 86a9961b617c896f582e96e09db8f169721a62eb | |
| parent | b5a52fa6c694c891a259233b29eb0ef4a47db57b (diff) | |
| parent | 4b623d80f73528a632576990ca51e34c333d5dd6 (diff) | |
| download | git-48ae20513ddde38121cc89be58580a5970c813ef.tar.gz | |
Merge branch 'mr/msvc-link-with-invalidcontinue'
* mr/msvc-link-with-invalidcontinue:
MSVC: link in invalidcontinue.obj for better POSIX compatibility
| -rw-r--r-- | config.mak.uname | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname index 77d736c20f..23a8803656 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -359,7 +359,7 @@ ifeq ($(uname_S),Windows) 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\" BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib - EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib + EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj PTHREAD_LIBS = lib = ifndef DEBUG |