From 8266109953e01663ab828b1fbd77932c975b1ca9 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Tue, 25 Apr 2017 17:26:37 +0200
Subject: Travis fixes

---
 dist/travis/before_script.sh |  6 ++++++
 dist/travis/script.sh        | 48 +++++++++++++++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/dist/travis/before_script.sh b/dist/travis/before_script.sh
index 7538bb5..8a6f397 100644
--- a/dist/travis/before_script.sh
+++ b/dist/travis/before_script.sh
@@ -9,14 +9,20 @@ case $OS in
 		sudo apt-get update -qq
 		sudo apt-get install -y \
 			cmake \
+			gengetopt \
 			libssh-dev
 		;;
 		
 	Darwin)
 		brew update
+		if test "X$CC" = "Xgcc"; then
+			brew install gcc48 --enable-all-languages || true
+			brew link --force gcc48 || true
+		fi
 		brew install \
 			cmake \
 			libssh \
+			gengetopt \
 			gettext \
 			|| true
 		# make sure cmake finds the brew version of gettext
diff --git a/dist/travis/script.sh b/dist/travis/script.sh
index 55c6890..7d3871b 100644
--- a/dist/travis/script.sh
+++ b/dist/travis/script.sh
@@ -18,20 +18,40 @@ case $OS in
 		;;
 
 	Darwin)
-		# forcing brew versions (of gettext) over Mac versions
-		export CFLAGS=-I/usr/local
-		export CXXFLAGS=-I/usr/local
-		export LDFLAGS=-L/usr/local/lib
-		mkdir build
-		cd build
-		cmake \
-			-DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release \
-			-DCMAKE_CXX_FLAGS=-g -G Xcode \
-			..
-		xcodebuild -configuration Release -target ALL_BUILD
-		xcodebuild -configuration Release -target RUN_TESTS
-		sudo xcodebuild -configuration Release -target install
-		cd ..
+		if test "X$CC" = "Xgcc"; then
+			# gcc on OSX is a mere frontend to clang, force using gcc 4.8
+			export CXX=g++-4.8
+			export CC=gcc-4.8
+			# forcing brew versions (of gettext) over Mac versions
+			export CFLAGS=-I/usr/local
+			export CXXFLAGS=-I/usr/local
+			export LDFLAGS=-L/usr/local/lib
+			mkdir build
+			cd build
+			cmake \
+				-DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release \
+				-DCMAKE_CXX_FLAGS=-g -G 'Unix Makefiles' \
+				..
+			make VERBOSE=1
+			make VERBOSE=1 test
+			sudo make VERBOSE=1 install
+			cd ..
+		else
+			# forcing brew versions (of gettext) over Mac versions
+			export CFLAGS=-I/usr/local
+			export CXXFLAGS=-I/usr/local
+			export LDFLAGS=-L/usr/local/lib
+			mkdir build
+			cd build
+			cmake \
+				-DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release \
+				-DCMAKE_CXX_FLAGS=-g -G Xcode \
+				..
+			xcodebuild -configuration Release -target ALL_BUILD
+			xcodebuild -configuration Release -target RUN_TESTS
+			sudo xcodebuild -configuration Release -target install
+			cd ..
+		fi
 		;;
 		
 	*)
-- 
cgit v1.2.3-54-g00ecf