From: LLVM Packaging Team Date: Fri, 4 Nov 2022 18:36:56 +0000 (+0000) Subject: clang-format-version X-Git-Tag: archive/raspbian/1%14.0.6-8+rpi1^2~91 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af1bc3ced11694c2ddf2b0b94955098651f90fe6;p=llvm-toolchain-14.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 1f6ff0fe29..bb31acff90 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/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-14', 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..a97535540e 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-14") "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..09de592420 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-14' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path')