[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  4b8574461b92ea64ef048335f942995a09025331 (commit)
      from  e4ad0763e86ab3677aab06a61acba4b157d185f7 (commit)


- Log -----------------------------------------------------------------
commit 4b8574461b92ea64ef048335f942995a09025331
Author: Emilia Kasper <emilia at openssl.org>
Date:   Sat Mar 12 17:18:25 2016 +0100

    Workaround for false -Warray-bounds in Travis
    
    ccache + clang produces a false strcmp warning, see
    https://llvm.org/bugs/show_bug.cgi?id=20144
    
    Since this only happens with ccache and --strict-warnings, and
    only with certain versions of glibc / clang, disabling
    ccache is a reasonable short-term workaround.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ec2396e..1ebe12b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,7 +75,7 @@ before_script:
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
           $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
-          if which ccache >/dev/null; then
+          if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then
               CC="ccache $CC";
           fi;
           $srcdir/config $CONFIG_OPTS;