Skip to content

Commit 8ba5eff

Browse files
committed
Merge branch 'ms/msvc'
* ms/msvc: Fix the exit code of MSVC build scripts on cygwin Fix MSVC build on cygwin
2 parents dc3c7a7 + b5d18b8 commit 8ba5eff

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ ifdef MSVC
929929
CC = compat/vcbuild/scripts/clink.pl
930930
AR = compat/vcbuild/scripts/lib.pl
931931
CFLAGS =
932-
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
932+
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
933933
COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o
934934
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -DSTRIP_EXTENSION=\".exe\"
935935
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib

compat/vcbuild/scripts/clink.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@
4545
push(@args, @cflags);
4646
}
4747
#printf("**** @args\n");
48-
exit system(@args);
48+
exit (system(@args) != 0);

compat/vcbuild/scripts/lib.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
}
2424
unshift(@args, "lib.exe");
2525
# printf("**** @args\n");
26-
exit system(@args);
26+
exit (system(@args) != 0);

0 commit comments

Comments
 (0)