From 910f4d711049541b05131919a38e577771e6ba22 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 1 Aug 2015 01:00:47 -0700 Subject: [PATCH] clang 3.8. --- .travis.yml | 6 +++--- xenia-build | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d69e4bbc..0412131f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ os: addons: apt: sources: - - llvm-toolchain-precise-3.7 + - llvm-toolchain-precise packages: - - clang-3.7 - - clang-format-3.7 + - clang-3.8 + - clang-format-3.8 git: # We handle submodules ourselves in xenia-build setup. diff --git a/xenia-build b/xenia-build index 158b36b77..40e661e25 100755 --- a/xenia-build +++ b/xenia-build @@ -223,15 +223,15 @@ def get_clang_format_binary(): """ attempts = [ 'C:\\Program Files (x86)\\LLVM\\bin\\clang-format.exe', - 'clang-format-3.7', + 'clang-format-3.8', 'clang-format', ] for binary in attempts: - if os.path.exists(binary): + if has_bin(binary): return binary print 'ERROR: clang-format is not on PATH' print 'LLVM is available from http://llvm.org/releases/download.html' - print 'At least version 3.7 is required.' + print 'At least version 3.8 is required.' print 'See docs/style_guide.md for instructions on how to get it.' sys.exit(1)