summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-10 02:14:55 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-10 02:53:41 +0100
commita70ca74086e5efe4f390302d10ca6167674d8743 (patch)
treeb530db870dcd99f8e56b19ca32453d71e7a73b54 /.travis.yml
parenta1673e1536729d49cb758b988ac7be368e9b1fdb (diff)
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>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
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 ..