1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
---
clang/tools/clang-format/clang-format-diff.py | 2 +-
clang/tools/clang-format/clang-format.el | 2 +-
clang/tools/clang-format/clang-format.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format-diff.py
===================================================================
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format-diff.py
@@ -63,7 +63,7 @@ def main():
'fallback in case clang-format is invoked with'
'-style=file, but can not find the .clang-format'
'file to use.')
- parser.add_argument('-binary', default='clang-format',
+ parser.add_argument('-binary', default='clang-format-15',
help='location of binary to use for clang-format')
args = parser.parse_args()
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.el
===================================================================
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/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-15")
"clang-format")
"Location of the clang-format executable.
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.py
===================================================================
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/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-15'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
|
