From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Thu, 28 Oct 2021 14:45:49 +0000 (+0100)
Subject: clang-format-version
X-Git-Tag: archive/raspbian/1%12.0.1-16+rpi1~85
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=251071a59f3a7425b6c3879207b6d109c185c69c;p=llvm-toolchain-12.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 6e653a1342..ce7eab742e 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -58,7 +58,7 @@ def main():
   parser.add_argument('-style',
                       help='formatting style to apply (LLVM, GNU, Google, Chromium, '
                       'Microsoft, Mozilla, WebKit)')
-  parser.add_argument('-binary', default='clang-format',
+  parser.add_argument('-binary', default='clang-format-12',
                       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 768acb3a5d..96278825a4 100644
--- a/clang/tools/clang-format/clang-format.el
+++ b/clang/tools/clang-format/clang-format.el
@@ -37,7 +37,7 @@
   :group 'tools)
 
 (defcustom clang-format-executable
-  (or (executable-find "clang-format")
+  (or (executable-find "clang-format-12")
       "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 76fedb6481..773a62dd79 100644
--- a/clang/tools/clang-format/clang-format.py
+++ b/clang/tools/clang-format/clang-format.py
@@ -48,7 +48,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-12'
 if vim.eval('exists("g:clang_format_path")') == "1":
   binary = vim.eval('g:clang_format_path')