[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  dc8980957ba12f49f7656429eda3a7b62c4cbb4c (commit)
      from  af170194a88d6127d447bea826845c23ca192727 (commit)


- Log -----------------------------------------------------------------
commit dc8980957ba12f49f7656429eda3a7b62c4cbb4c
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Oct 7 09:35:12 2015 +0200

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml                 | 4 ++--
 Configurations/10-main.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34b4d9d..c923119 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,10 @@ matrix:
 before_script:
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw $CONFIG_OPTS;
+          ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
       elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw64 $CONFIG_OPTS;
+          ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
           ./config $CONFIG_OPTS;
       fi
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9ebd20f..426fbfa 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",