From 721c6f1dae7d88226a18236e2ce7d41d59f4faac Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Mon, 4 Aug 2014 20:53:43 -0400
Subject: [PATCH] Update .travis.yml

---
 .travis.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f89c438..d395fad2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
 language: cpp
-matrix:
-    include:
-        - cpp: gcc
-          env: COMPILER=g++-4.8
-        - cpp: clang
-          env: COMPILER=clang++
+compiler:
+    - gcc
+    - clang
 
 branches:
     only:
@@ -14,8 +11,8 @@ before_install:
     - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
     - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
     - sudo apt-get --yes update
-    - sudo apt-get --yes install g++-4.8
+    - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.8; export CXX=g++-4.8; fi
     - sudo apt-get --yes install ninja-build
     - sudo apt-get --yes install liblua5.2-dev
 
-script: ./bootstrap.py --ci --cxx=$COMPILER && ninja
+script: ./bootstrap.py --ci --cxx=$CXX && ninja