From: LLVM Packaging Team Date: Tue, 28 Sep 2021 10:06:50 +0000 (+0100) Subject: clang-format-version X-Git-Tag: archive/raspbian/1%11.1.0-4+rpi1^2~79 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4b826ec51c61d1081feeb7f4efb02c20b6e90a84;p=llvm-toolchain-11.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 c5331202f..582631729 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-11', 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 768acb3a5..a66085744 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-11") "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 76fedb648..705435938 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-11' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path')