summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2017-11-11 22:24:12 +0100
committerAndy Polyakov <appro@openssl.org>2017-11-13 10:59:16 +0100
commit0d2394a8c035c9d1b5a55f1569c1ea9c880b128c (patch)
tree94ba247fdd3400daf9e2ff6432007095c874cf08 /Configurations
parent3a63c0edab842af3e84ef1cad2b4eb701eece3e1 (diff)
Configurations/10-main.conf: add back /WX to VC-WIN32.
We had /WX (treat warnings as errors) in VC-WIN32 for long time. At some point it was somehow omitted. It's argued that it allows to keep better focus on new code, which motivates the comeback... Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4721)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index ac85e5050a..f8f4bd194c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1281,7 +1281,7 @@ sub vms_info {
inherit_from => [ "BASE_Windows" ],
template => 1,
cc => "cl",
- cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
+ cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS",
defines => add(sub { my @defs = ();
unless ($disabled{"zlib-dynamic"}) {
my $zlib =
@@ -1380,6 +1380,7 @@ sub vms_info {
# configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'
inherit_from => [ "VC-noCE-common", asm("x86_asm"),
sub { $disabled{shared} ? () : "uplink_common" } ],
+ cflags => add("-WX"),
as => sub { vc_win32_info()->{as} },
asflags => sub { vc_win32_info()->{asflags} },
asoutflag => sub { vc_win32_info()->{asoutflag} },