summaryrefslogtreecommitdiffstats
path: root/Configurations/10-main.conf
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2015-10-07 09:35:12 +0200
committerAndy Polyakov <appro@openssl.org>2015-10-12 12:07:29 +0200
commitdc8980957ba12f49f7656429eda3a7b62c4cbb4c (patch)
treeb6879eda1623e7976ea6b390e20f66b66c84f148 /Configurations/10-main.conf
parentaf170194a88d6127d447bea826845c23ca192727 (diff)
Configurations: move -Wno-pedantic-ms-format to .travis.yml.
The option is not available in older toolchains and would cause breakage. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations/10-main.conf')
-rw-r--r--Configurations/10-main.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9ebd20fe13..426fbfa026 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1174,7 +1174,7 @@
"mingw" => {
inherit_from => [ asm("x86_asm") ],
cc => "gcc",
- cflags => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall -Wno-pedantic-ms-format",
+ cflags => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall",
debug_cflags => "-g -O0",
release_clags => "-O3 -fomit-frame-pointer",
thread_cflag => "-D_MT",
@@ -1199,7 +1199,7 @@
# Applink is never engaged and can as well be omitted.
inherit_from => [ asm("x86_64_asm") ],
cc => "gcc",
- cflags => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -Wno-pedantic-ms-format",
+ cflags => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",
debug_cflags => "-g -O0",
release_clags => "-O3",
thread_cflag => "-D_MT",