From: Richard Levitte <levitte@openssl.org>
Date: Thu, 10 Mar 2016 01:14:55 +0000 (+0100)
Subject: Travis - don't use ccache with cross compiles
X-Git-Tag: OpenSSL_1_1_0-pre4~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a70ca74086e5efe4f390302d10ca6167674d8743;p=oweals%2Fopenssl.git

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

diff --git a/.travis.yml b/.travis.yml
index 332254371f..750db1f437 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 ..