From 0291e851febca47de3487d5fda47719a050dca93 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 29 Jan 2016 16:05:09 -0800
Subject: [PATCH] disable g++4.9 build which gets killed / use clang 3.6 to
 prepare for c++14 support

---
 .travis.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5834c83ce..ab058cca0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,9 @@ addons:
   apt:
     sources:
      - ubuntu-toolchain-r-test
-     - llvm-toolchain-precise-3.5
+     - llvm-toolchain-precise-3.6
     packages:
-     - clang-3.5
+     - clang-3.6
 
 cache:
   directories:
@@ -32,13 +32,15 @@ matrix:
         apt:
           sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ]
           packages: [ 'clang-3.6', 'libstdc++-4.9-dev', 'libstdc++6' ]
-    - os: linux
-      compiler: gcc
-      env: JOBS=6 CXX="ccache g++-4.9" CC="gcc-4.9"
-      addons:
-        apt:
-          sources: [ 'ubuntu-toolchain-r-test' ]
-          packages: [ 'gcc-4.9', 'g++-4.9', 'libstdc++-4.9-dev', 'libstdc++6' ]
+    # OOM killer knocking out build on render_markers_symbolizer.cpp
+    #
+    #- os: linux
+    #  compiler: gcc
+    #  env: JOBS=6 CXX="ccache g++-4.9" CC="gcc-4.9"
+    #  addons:
+    #    apt:
+    #      sources: [ 'ubuntu-toolchain-r-test' ]
+    #      packages: [ 'gcc-4.9', 'g++-4.9', 'libstdc++-4.9-dev', 'libstdc++6' ]
     - os: osx
       compiler: clang
       osx_image: xcode7 # upgrades clang from 6 -> 7