From cf76bbae48f3fe4d00d416a9b91d09672fe2173a Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Thu, 15 Jun 2017 08:56:43 +0200
Subject: travis: minor cosmetics

This is just to make the diff to my private travis script a bit smaller.

Now we always use $CC _after_ the install script which makes it possible
to install/update the compiler in the install section.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 .travis-functions.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to '.travis-functions.sh')

diff --git a/.travis-functions.sh b/.travis-functions.sh
index db50f0997..ece05d409 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -17,8 +17,15 @@ MAKE="make -j2"
 DUMP_CONFIG_LOG="short"
 export TS_OPT_parsable="yes"
 
+# workaround ugly warning on travis OSX,
+# see https://github.com/direnv/direnv/issues/210
+shell_session_update() { :; }
+
 function xconfigure
 {
+	which "$CC"
+	"$CC" --version
+
 	./configure "$@" $OSX_CONFOPTS
 	err=$?
 	if [ "$DUMP_CONFIG_LOG" = "short" ]; then
@@ -58,7 +65,8 @@ function check_root
 	osx_prepare_check
 	sudo -E $MAKE check TS_OPTS="$opts" || return
 
-	sudo $MAKE install || return
+	# keep PATH to make sure sudo would find $CC
+	sudo env "PATH=$PATH" $MAKE install || return
 }
 
 function check_dist
@@ -75,8 +83,8 @@ function travis_install_script
 		return
 	fi
 
-	# install some packages from Ubuntu's default sources
-	sudo apt-get -qq update
+	# install required packages
+	sudo apt-get -qq update --fix-missing
 	sudo apt-get install -qq >/dev/null \
 		bc \
 		btrfs-tools \
-- 
cgit v1.2.3-55-g7522