Merge branch 'jc/t3404-one-shot-export-fix' into es/test-lint-one-shot-export

diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 109ef280da9884027f17fe7f233b6b818bd71393..ceecc889caf9fc3af038ffa4179056291e90b704 100755 (executable)
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -99,6 +99,9 @@ export DEFAULT_TEST_TARGET=prove
 export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 export GIT_TEST_OPTS="--verbose-log -x"
 export GIT_TEST_CLONE_2GB=YesPlease
+if [ "$jobname" = linux-gcc ]; then
+       export CC=gcc-8
+fi
 
 case "$jobname" in
 linux-clang|linux-gcc)