From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Wed, 14 Jun 2017 17:06:20 +0000 (+0100)
Subject: clang-format-version
X-Git-Tag: archive/raspbian/1%4.0.1-1+rpi1~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c1c7a084d9bb9695a477b1f100b3b5e2ca86fa87;p=llvm-toolchain-4.0.git

clang-format-version


Gbp-Pq: Name clang-format-version.diff
---

diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index ffa30e70d..18fd8a218 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -55,7 +55,7 @@ def main():
   parser.add_argument('-style',
                       help='formatting style to apply (LLVM, Google, Chromium, '
                       'Mozilla, WebKit)')
-  parser.add_argument('-binary', default='clang-format',
+  parser.add_argument('-binary', default='clang-format-4.0',
                       help='location of binary to use for clang-format')
   args = parser.parse_args()
 
diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el
index 0ac2da3ad..d46d53fa7 100644
--- a/clang/tools/clang-format/clang-format.el
+++ b/clang/tools/clang-format/clang-format.el
@@ -36,7 +36,7 @@
   :group 'tools)
 
 (defcustom clang-format-executable
-  (or (executable-find "clang-format")
+  (or (executable-find "clang-format-4.0")
       "clang-format")
   "Location of the clang-format executable.
 
diff --git a/clang/tools/clang-format/clang-format.py b/clang/tools/clang-format/clang-format.py
index ae8a6ebf7..838eaef6e 100644
--- a/clang/tools/clang-format/clang-format.py
+++ b/clang/tools/clang-format/clang-format.py
@@ -36,7 +36,7 @@ import vim
 
 # set g:clang_format_path to the path to clang-format if it is not on the path
 # Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-4.0'
 if vim.eval('exists("g:clang_format_path")') == "1":
   binary = vim.eval('g:clang_format_path')