diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-09 00:02:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 00:02:23 -0700 |
| commit | 8ba5effa26707fdc5b8a3b10f0fdd3007f657b64 (patch) | |
| tree | 5aedbfbccfcd12aac9195b8e9e28908ff321695a | |
| parent | dc3c7a7256ed05a14baaffbc35c016f7ffde51c5 (diff) | |
| parent | b5d18b8e6f68746a85edfea08e9aff3351d7e891 (diff) | |
| download | git-8ba5effa26707fdc5b8a3b10f0fdd3007f657b64.tar.gz | |
Merge branch 'ms/msvc'
* ms/msvc:
Fix the exit code of MSVC build scripts on cygwin
Fix MSVC build on cygwin
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | compat/vcbuild/scripts/clink.pl | 2 | ||||
| -rw-r--r-- | compat/vcbuild/scripts/lib.pl | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -929,7 +929,7 @@ ifdef MSVC 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 diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index 0ffd59f9fb..f9528c0ea1 100644 --- a/compat/vcbuild/scripts/clink.pl +++ b/compat/vcbuild/scripts/clink.pl @@ -45,4 +45,4 @@ if ($is_linking) { push(@args, @cflags); } #printf("**** @args\n"); -exit system(@args); +exit (system(@args) != 0); diff --git a/compat/vcbuild/scripts/lib.pl b/compat/vcbuild/scripts/lib.pl index 68f66446ea..d8054e469f 100644 --- a/compat/vcbuild/scripts/lib.pl +++ b/compat/vcbuild/scripts/lib.pl @@ -23,4 +23,4 @@ while (@ARGV) { } unshift(@args, "lib.exe"); # printf("**** @args\n"); -exit system(@args); +exit (system(@args) != 0); |