зеркало из https://github.com/microsoft/git.git
Merge branch 'ms/msvc'
* ms/msvc: Fix the exit code of MSVC build scripts on cygwin Fix MSVC build on cygwin
This commit is contained in:
Коммит
8ba5effa26
2
Makefile
2
Makefile
|
@ -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
|
||||
|
|
|
@ -45,4 +45,4 @@ if ($is_linking) {
|
|||
push(@args, @cflags);
|
||||
}
|
||||
#printf("**** @args\n");
|
||||
exit system(@args);
|
||||
exit (system(@args) != 0);
|
||||
|
|
|
@ -23,4 +23,4 @@ while (@ARGV) {
|
|||
}
|
||||
unshift(@args, "lib.exe");
|
||||
# printf("**** @args\n");
|
||||
exit system(@args);
|
||||
exit (system(@args) != 0);
|
||||
|
|
Загрузка…
Ссылка в новой задаче