From 915062c6a34873ee8daabb83948cc7883b8a33f8 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 14 Jun 2016 21:25:33 -0700
Subject: [PATCH] [travis] fix apt package installs

---
 .travis.yml              | 16 ++++++++--------
 scripts/travis-common.sh |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86d35c1a2..bcea120fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,17 +27,17 @@ matrix:
       compiler: ": clang"
       env: JOBS=8 MASON_PUBLISH=true _CXX="ccache clang++-3.8 -Qunused-arguments" _CC="clang-3.8" TRIGGER=true
       addons:
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test']
-        packages: [ 'libstdc++6']
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test']
+          packages: [ 'libstdc++6', 'libstdc++-5-dev']
     - os: linux
       sudo: false
       compiler: ": clang-coverage"
-      env: JOBS=8 COVERAGE=true LLVM_VERSION="3.8" _CXX="ccache clang++-3.8 -Qunused-arguments" _CC="clang-3.8"
+      env: JOBS=8 COVERAGE=true _CXX="ccache clang++-3.8 -Qunused-arguments" _CC="clang-3.8"
       addons:
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test']
-        packages: [ 'libstdc++6','libstdc++-5-dev' ]
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test']
+          packages: [ 'libstdc++6','libstdc++-5-dev' ]
     - os: osx
       compiler: ": clang-osx"
       # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
@@ -86,7 +86,7 @@ script:
  - cat config.log
  - make
  - make test
- - enabled ${COVERAGE} coverage
+ - enabled ${COVERAGE} export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov" && coverage
  - enabled ${BENCH} make bench
 
 after_success:
diff --git a/scripts/travis-common.sh b/scripts/travis-common.sh
index 0899df1ce..9cee676dc 100644
--- a/scripts/travis-common.sh
+++ b/scripts/travis-common.sh
@@ -92,7 +92,7 @@ configure () {
 
 coverage () {
     ./mason_packages/.link/bin/cpp-coveralls \
-        --gcov /usr/bin/llvm-cov-${LLVM_VERSION} \
+        --gcov ${LLVM_COV} \
         --build-root . --gcov-options '\-lp' \
         --exclude mason_packages \
         --exclude .sconf_temp --exclude benchmark --exclude deps \