From 3f6de1785673961ea88e1441a42cb99a6ea64962 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Thu, 25 Feb 2016 08:08:05 -0500
Subject: [PATCH] clang and g++ versions we want to target

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

diff --git a/.travis.yml b/.travis.yml
index 2bd6e195..4b98cea7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,10 @@ before_install:
     - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
     - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
     - sudo apt-get --yes update
-    - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.8; fi
-    - if [ "$CXX" == "g++" ]; then export CXX=g++-4.8; fi
+    - 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 6b694f06..e32eb2ce 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -54,7 +54,7 @@ args = parser.parse_args()
 # general variables
 include = [ '.', os.path.join('Catch', 'include')]
 depends = []
-cxxflags = [ '-Wall', '-Wextra', '-pedantic', '-pedantic-errors' ]
+cxxflags = [ '-Wall', '-Wextra', '-pedantic', '-pedantic-errors', '-std=c++14' ]
 ldflags = []
 script_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
 sol_dir = os.path.join(script_dir, 'sol')
@@ -91,9 +91,6 @@ if args.ci:
         include.extend(['/usr/include/' + args.lua_lib])
     else:
         include.extend(['/usr/include/lua-5.3', '/usr/include/lua-5.2', '/usr/include/lua-5.1'])
-    cxxflags.extend(['-std=c++1y'])
-else:
-    cxxflags.extend(['-std=c++14'])
 
 if args.testing:
     cxxflags.append('-Wmissing-declarations')