Travis - don't use ccache with cross compiles

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index dff2f94978a90e9e0d5272a97e92d88f1cb259dd..750db1f437c341d11326660fd77136ea4ed41d00 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,14 +60,13 @@ matrix:
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
     - tar -xvzf _srcdist.tar.gz
-    - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then
-          srcdir=../_srcdir;
-          mkdir _build;
-          cd _build;
-          CC="ccache $CC";
-      else
+    - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then
           srcdir=.;
           cd _srcdist;
+      else
+          srcdir=../_srcdist;
+          mkdir _build;
+          cd _build;
       fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
@@ -76,15 +75,18 @@ 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 ..
 
 script:
-    - if expr "$CONFIG_OPTS" : "--unified"; then
-          cd _build;
-      else
+    - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then
           cd _srcdist;
+      else
+          cd _build;
       fi
     - make
     - if [ -z "$BUILDONLY" ]; then