From f58372b348a1aa59a1f9c809e05b6160947b2f73 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:37:12 +0530
Subject: [PATCH] CI: Use the 'real' gcc on OSX; restore linux which was
 removed earlier temporarily

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1fb3fdd..a52e022 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: cpp
 
 os:
+  - linux
   - osx
 
 compiler:
@@ -8,6 +9,7 @@ compiler:
   - clang
 
 before_install:
+  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8; fi"
   - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
 
 addons: