From f700bbc93d3f701298ee108d30bef305203d43c1 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Thu, 25 Feb 2016 08:54:58 -0500
Subject: [PATCH] This is a lot harder than it needs to be.

---
 .travis.yml  | 4 ++++
 bootstrap.py | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 722be834..3f51a26d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+dist: trusty
+
 language: cpp
 compiler:
     - gcc
@@ -14,6 +16,8 @@ before_install:
     - sudo apt-get --yes update
     - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.9; fi
     - if [ "$CXX" == "g++" ]; then export CXX=g++-4.9; fi
+    - if [ "$CXX" == "clang++" ]; then sudo apt-get --yes install clang-3.5; fi
+    - if [ "$CXX" == "clang++" ]; then export CXX=clang++-3.5; fi
     - sudo apt-get --yes install ninja-build
     - sudo apt-get --yes install liblua5.2-dev
     - sudo apt-get --yes install libluajit-5.1-dev
diff --git a/bootstrap.py b/bootstrap.py
index be84040f..57f09718 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -87,11 +87,8 @@ if args.lua_lib:
 if args.ci:
     ldflags.extend(library_includes(['lib']))
     include.extend(['./include'])
-    if 'clang++' in args.cxx:
-         cxxflags.remove('-std=c++14')
-         cxxflags.append('-std=c++1y')
     if args.lua_lib:
-        if args.lualib == 'luajit':
+        if args.lua_lib == 'luajit':
             include.extend(['/usr/include/luajit-2.0'])
             ldflags.extend(libraries(['luajit-5.1']))
         else: