update of patch which didn't update 17 => 18

This commit is contained in:
Sylvestre Ledru 2023-08-18 18:49:45 +02:00
parent bf2d3ab712
commit 15a65a89f8
7 changed files with 11 additions and 11 deletions

View File

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

View File

@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan
parser.add_argument(
"-binary",
- default="clang-format",
+ default="clang-format-17",
+ default="clang-format-18",
help="location of binary to use for clang-format",
)
args = parser.parse_args()
@ -26,7 +26,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-17")
+ (or (executable-find "clang-format-18")
"clang-format")
"Location of the clang-format executable.
@ -39,7 +39,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan
# 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-17"
+binary = "clang-format-18"
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval("g:clang_format_path")

View File

@ -8,12 +8,12 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extr
parser.add_argument(
- "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary"
+ "-clang-tidy-binary", metavar="PATH",
+ default='clang-tidy-17',
+ default='clang-tidy-18',
+ help="path to clang-tidy binary"
)
parser.add_argument(
"-clang-apply-replacements-binary",
+ default='clang-apply-replacements-17',
+ default='clang-apply-replacements-18',
metavar="PATH",
help="path to clang-apply-replacements binary",
)

View File

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

View File

@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/p
file = "libclang.dll"
else:
- file = "libclang.so"
+ file = "libclang-17.so"
+ file = "libclang-18.so"
if Config.library_path:
file = Config.library_path + "/" + file

View File

@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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-17/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-18/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_17~++20230523093327+96a003b9bf79/clang/tools/scan
metavar="<path>",
dest="clang",
- default="clang",
+ default="clang-17",
+ default="clang-18",
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.""",