Revert to old ccache injection logic while keeping cros-compilation l…

…ogic happy.

.travis.yml

@@ -116,9 +116,10 @@ matrix:
 
 before_script:
   - ${COMPILER} --version
+  - CXX="ccache $COMPILER"
   - source build-scripts/requirements.sh
 
-script: make -j3 CCACHE=1 RELEASE=1 CROSS="$CROSS_COMPILATION" && $WINE ./tests/cata_test
+script: make -j3 RELEASE=1 CROSS="$CROSS_COMPILATION" && $WINE ./tests/cata_test
 
 after_success:
   - if [ -n "${CODE_COVERAGE}" ]; then coveralls -b . -i src -e tests --gcov /usr/bin/gcov-4.8; fi

build-scripts/requirements.sh

@@ -19,4 +19,7 @@ if [ -n "${MXE_TARGET}" ]; then
   sudo apt-get --yes install mxe-${MXE2_TARGET}-gcc mxe-${MXE2_TARGET}-gettext mxe-${MXE2_TARGET}-glib
   export PLATFORM='i686-w64-mingw32.static'
   export CROSS_COMPILATION='${MXE_DIR}/${PLATFORM}-'
-fi
+  # Need to overwrite CXX to make the Makefile $CROSS logic work right.
+  export CXX="$COMPILER"
+  export CCACHE=1
+fi