Skip to content

Commit 58b1f79

Browse files
committed
Update clang tools to use llvm20
1 parent 17d66c3 commit 58b1f79

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

cc/defs.bzl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,24 @@ def _symbolizer_env(val):
115115
# The + operator is not supported on dict and select types so we need to be
116116
# clever here.
117117
Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_linux"): dict(val, **{
118-
"ASAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)",
119-
"UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)",
120-
"MSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)",
121-
"TSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)",
118+
"ASAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm20//:symbolizer)",
119+
"UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm20//:symbolizer)",
120+
"MSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm20//:symbolizer)",
121+
"TSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm20//:symbolizer)",
122122
}),
123123
Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_darwin"): dict(val, **{
124-
"ASAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)",
125-
"UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)",
126-
"MSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)",
127-
"TSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)",
124+
"ASAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm20//:symbolizer)",
125+
"UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm20//:symbolizer)",
126+
"MSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm20//:symbolizer)",
127+
"TSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm20//:symbolizer)",
128128
}),
129129
"//conditions:default": {},
130130
})
131131

132132
def _symbolizer_data():
133133
return select({
134-
Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_linux"): ["@x86_64-linux-llvm//:symbolizer"],
135-
Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_darwin"): ["@x86_64-darwin-llvm//:symbolizer"],
134+
Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_linux"): ["@x86_64-linux-llvm20//:symbolizer"],
135+
Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_darwin"): ["@x86_64-darwin-llvm20//:symbolizer"],
136136
"//conditions:default": [],
137137
})
138138

clang_format/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ choose_clang_format(
1919
filegroup(
2020
name = "_clang_format_bin",
2121
srcs = select({
22-
"@rules_swiftnav//platforms:aarch64_darwin": ["@aarch64-darwin-llvm//:clang-format"],
23-
"@bazel_tools//src/conditions:darwin_x86_64": ["@x86_64-darwin-llvm//:clang-format"],
24-
"@bazel_tools//src/conditions:linux_x86_64": ["@x86_64-linux-llvm//:clang-format"],
22+
"@rules_swiftnav//platforms:aarch64_darwin": ["@aarch64-darwin-llvm20//:clang-format"],
23+
"@bazel_tools//src/conditions:darwin_x86_64": ["@x86_64-darwin-llvm20//:clang-format"],
24+
"@bazel_tools//src/conditions:linux_x86_64": ["@x86_64-linux-llvm20//:clang-format"],
2525
"//conditions:default": [":clang_format_bin"],
2626
}),
2727
visibility = ["//visibility:public"],

clang_tidy/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ filegroup(
3030
name = "clang_tidy_executable_default",
3131
srcs = select(
3232
{
33-
"@bazel_tools//src/conditions:darwin_x86_64": ["@x86_64-darwin-llvm//:clang-tidy"],
34-
"@bazel_tools//src/conditions:linux_x86_64": ["@x86_64-linux-llvm//:clang-tidy"],
33+
"@bazel_tools//src/conditions:darwin_x86_64": ["@x86_64-darwin-llvm20//:clang-tidy"],
34+
"@bazel_tools//src/conditions:linux_x86_64": ["@x86_64-linux-llvm20//:clang-tidy"],
3535
"//conditions:default": [":clang_tidy_bin"],
3636
},
3737
),

0 commit comments

Comments
 (0)