From a378f07569c9de2b8a2b6f5f9e4ce2ae6d490547 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 24 Aug 2017 08:28:24 -0700
Subject: [PATCH] test clang 4.0.1 on travis

---
 .travis.yml  | 14 +++++++-------
 bootstrap.sh |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 174406b30..89c44fe41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
     - os: linux
       sudo: false
       compiler: ": clang"
-      env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
+      env: JOBS=8 CXX="ccache clang++-4.0 -Qunused-arguments" CC="clang-4.0" TRIGGER=true
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
@@ -39,7 +39,7 @@ matrix:
     - os: linux
       sudo: false
       compiler: ": clang-coverage"
-      env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9"
+      env: JOBS=8 COVERAGE=true CXX="ccache clang++-4.0 -Qunused-arguments" CC="clang-4.0"
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
@@ -82,12 +82,12 @@ before_script:
  - source bootstrap.sh
  - |
    if [[ $(uname -s) == 'Linux' ]]; then
-     mason install clang++ 3.9.1
-     export PATH=$(mason prefix clang++ 3.9.1)/bin:${PATH}
-     mason install llvm-cov 3.9.1
-     export PATH=$(mason prefix llvm-cov 3.9.1)/bin:${PATH}
+     mason install clang++ 4.0.1
+     export PATH=$(mason prefix clang++ 4.0.1)/bin:${PATH}
+     mason install llvm-cov 4.0.1
+     export PATH=$(mason prefix llvm-cov 4.0.1)/bin:${PATH}
      which llvm-cov
-     export LLVM_COV="$(mason prefix llvm-cov 3.9.1)/bin/llvm-cov"
+     export LLVM_COV="$(mason prefix llvm-cov 4.0.1)/bin/llvm-cov"
    fi
  - ccache --version
  - ccache -p || true
diff --git a/bootstrap.sh b/bootstrap.sh
index 030c0dc0b..b6bd4924c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="v0.11.1"
+MASON_VERSION="v0.14.2"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then