diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-10-06 18:23:42 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-10-06 18:30:47 +0200 |
| commit | 2d2846237364671670c4b9a8415ea957887e1797 (patch) | |
| tree | 4638d96264250b6104e5b156595814bb1a69a253 /Configurations/10-main.conf | |
| parent | SSLv2 compat ciphers: clarify comment (diff) | |
| download | openssl-2d2846237364671670c4b9a8415ea957887e1797.tar.xz openssl-2d2846237364671670c4b9a8415ea957887e1797.zip | |
Fix travis builds on master
-Allow mingw debug builds to fail on Travis CI
-Fix Travis email notifications config
-Rename a variable to avoid a bogus warning with old GCC
error: declaration of ``dup'' shadows a global declaration [-Werror=shadow]
-Disable pedantic ms-format warnings with mingw
-Properly define const DH parameters
-Restore --debug flag in Travis CI builds; -d would get incorrectly passed
to ./Configure in mingw debug builds.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 426fbfa026..9ebd20fe13 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", + cflags => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall -Wno-pedantic-ms-format", 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", + cflags => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -Wno-pedantic-ms-format", debug_cflags => "-g -O0", release_clags => "-O3", thread_cflag => "-D_MT", |