c3-lang/libffi

diff --git a/.travis/build-in-container.sh b/.travis/build-in-container.sh
index 85624bf..6aa302e 100755
--- a/.travis/build-in-container.sh
+++ b/.travis/build-in-container.sh
@@ -4,11 +4,7 @@ cd /opt
 
 export QEMU_LD_PREFIX=/usr/${HOST}
 
-if ! test "x$HOST" == "x"; then
-    ./configure --host=${HOST} --disable-shared;
-else
-    ./configure
-fi
+./configure ${HOST+--host=$HOST --disable-shared}
 make
 make dist
 make check RUNTESTFLAGS="-a $RUNTESTFLAGS"
diff --git a/.travis/build.sh b/.travis/build.sh
index f8f78a2..61d92d0 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -36,7 +36,7 @@ function build_foreign_linux()
 
 function build_cross_linux()
 {
-    docker run --rm -t -i -v `pwd`:/opt -e HOST="${HOST}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh
+    docker run --rm -t -i -v `pwd`:/opt -e HOST="${HOST}" -e CC="${HOST}-gcc-8" -e CXX="${HOST}-g++-8" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh
     exit $?
 }