[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a70ca74086e5efe4f390302d10ca6167674d8743 (commit)
      from  a1673e1536729d49cb758b988ac7be368e9b1fdb (commit)


- Log -----------------------------------------------------------------
commit a70ca74086e5efe4f390302d10ca6167674d8743
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 10 02:14:55 2016 +0100

    Travis - don't use ccache with cross compiles
    
    Although theoretically possible, Configure doesn't treat CC variable
    set like this very well: CC="ccache i686-w64-mingw32-gcc"
    Also, this Travis script doesn't recognise the possibility either.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3322543..750db1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,9 +67,6 @@ before_script:
           srcdir=../_srcdist;
           mkdir _build;
           cd _build;
-          if which ccache >/dev/null; then
-              CC="ccache $CC";
-          fi
       fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
@@ -78,6 +75,9 @@ 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
+              CC="ccache $CC";
+          fi
           $srcdir/config $CONFIG_OPTS;
       fi
     - cd ..