mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-10-31 10:24:01 +00:00
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
---
|
|
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_14~++20200508142032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py
|
|
+++ llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/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-14',
|
|
help='location of binary to use for clang-format')
|
|
args = parser.parse_args()
|
|
|
|
Index: llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/clang/tools/clang-format/clang-format.el
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el
|
|
+++ llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/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-14")
|
|
"clang-format")
|
|
"Location of the clang-format executable.
|
|
|
|
Index: llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/clang/tools/clang-format/clang-format.py
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py
|
|
+++ llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/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-14'
|
|
if vim.eval('exists("g:clang_format_path")') == "1":
|
|
binary = vim.eval('g:clang_format_path')
|
|
|