From e22ef4ba7048df651153c7b9a934ea87daf69cfc Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 27 Apr 2017 10:39:40 +0200
Subject: another try to remove gcc/osx builds

---
 .travis.yml           |  2 +-
 dist/travis/script.sh | 49 ++++++++++++-------------------------------------
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c33affe..36a3361 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ compiler:
 matrix:
   exclude:
     - compiler: gcc
-    - os: osx
+      os: osx
 sudo: required
 before_install:
 - chmod +x dist/travis/*.sh
diff --git a/dist/travis/script.sh b/dist/travis/script.sh
index 5f0d5e4..cb03c8b 100644
--- a/dist/travis/script.sh
+++ b/dist/travis/script.sh
@@ -8,9 +8,7 @@ case $OS in
 	Linux)
 		mkdir build
 		cd build
-		cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-			-DLIB_INSTALL_DIR=lib -DCMAKE_CXX_FLAGS=-g \
-			..
+		cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
 		make VERBOSE=1
 		make VERBOSE=1 test
 		sudo make VERBOSE=1 install
@@ -18,40 +16,17 @@ case $OS in
 		;;
 
 	Darwin)
-		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_BUILD_TYPE=Release \
-				-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_BUILD_TYPE=Release \
-				-G Xcode \
-				..
-			xcodebuild -configuration Release -target ALL_BUILD
-			xcodebuild -configuration Release -target RUN_TESTS
-			sudo xcodebuild -configuration Release -target install
-			cd ..
-		fi
+		# 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_BUILD_TYPE=Release -G Xcode ..
+		xcodebuild -configuration Release -target ALL_BUILD
+		xcodebuild -configuration Release -target RUN_TESTS
+		sudo xcodebuild -configuration Release -target install
+		cd ..
 		;;
 		
 	*)
-- 
cgit v1.2.3-54-g00ecf