diff --git a/.travis.yml b/.travis.yml
index e522e63f..53800df1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ before_install:
     - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
     - sudo apt-get --yes update
     - sudo apt-get --yes install g++-4.8
+    - if [ "$CXX" == "g++" ]; then export CXX=g++-4.8; fi
     - sudo apt-get --yes install ninja-build
     - sudo apt-get --yes install liblua5.2-dev
 
diff --git a/bootstrap.py b/bootstrap.py
index c36b4b5f..43bba099 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -66,6 +66,9 @@ if args.debug:
 else:
     cxxflags.extend(['-DNDEBUG', '-O3'])
 
+if args.cxx == 'clang++':
+    cxxflags.extend(['-Wno-unused-value', '-Wno-constexpr-not-const'])
+
 if args.lua_dir:
     include.extend([os.path.join(args.lua_dir, 'include')])
     ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')]))