update of the missing patch

This commit is contained in:
Sylvestre Ledru 2023-01-30 09:31:31 +01:00
parent c245e502fa
commit be8f84d14e
7 changed files with 10 additions and 10 deletions

View File

@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan
$Clang = $ENV{'CLANG_CXX'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-16'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-17'; }
$IsCXX = 1
}
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan
$Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-16'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-17'; }
$IsCXX = 0
}

View File

@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan
'-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-16',
+ parser.add_argument('-binary', default='clang-format-17',
help='location of binary to use for clang-format')
args = parser.parse_args()
@ -26,7 +26,7 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-16")
+ (or (executable-find "clang-format-17")
"clang-format")
"Location of the clang-format executable.

View File

@ -6,10 +6,10 @@ Index: llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extr
action='store_true', help='allow alpha checkers from '
'clang-analyzer.')
parser.add_argument('-clang-tidy-binary', metavar='PATH',
+ default='clang-tidy-16',
+ default='clang-tidy-17',
help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
+ default='clang-apply-replacements-16',
+ default='clang-apply-replacements-17',
help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy '

View File

@ -6,7 +6,7 @@ Index: llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-
kMaxPortsToTry = 100
###
+BASE_DIR = '/usr/share/clang/scan-view-16'
+BASE_DIR = '/usr/share/clang/scan-view-17'
def url_is_up(url):

View File

@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/p
file = 'libclang.dll'
else:
- file = 'libclang.so'
+ file = 'libclang-16.so'
+ file = 'libclang-17.so'
if Config.library_path:
file = Config.library_path + '/' + file

View File

@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
if (!defined $Clang || ! -x $Clang) {
- $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-16/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-17/bin/clang");
if (!defined $Clang || ! -x $Clang) {
# When an Xcode toolchain is present, look for a clang in the sibling bin
# of the parent of the bin directory. So if scan-build is at

View File

@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan
metavar='<path>',
dest='clang',
- default='clang',
+ default='clang-16',
+ default='clang-17',
help="""'%(prog)s' uses the 'clang' executable relative to itself for
static analysis. One can override this behavior with this option by
using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")