From 28b83cbe474c2cd106bb3b540cf15d0d94af232e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 22 Dec 2015 17:02:49 -0800
Subject: [PATCH] ensure we use upgraded gcc as well as g++

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 884b7fe..6c6e4af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
         apt:
           packages: [ 'protobuf-compiler', 'libprotobuf-dev' ]
     - os: linux
-      env: COVERAGE=gcov-4.9 CXX=g++-4.9
+      env: COVERAGE=gcov-4.9 CXX=g++-4.9 CC=gcc-4.9
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
@@ -30,7 +30,6 @@ script:
  - echo '{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[0,0]}}' > test.json
  - ./tippecanoe -o test.mbtiles test.json
  - if [ -n "${COVERAGE}" ]; then
-       rm vector_tile.pb.o;
        ${COVERAGE} -lp *.o;
        pip install --user cpp-coveralls;
        ~/.local/bin/coveralls --no-gcov -i ./;