Skip to content

Commit 6cde79d

Browse files
authored
Update module llvm20 and fix symlinks (#165)
During integration of `llvm20` in a `bzl_mod` environment, following points needed to be fixed: * incorrect sysroot * no valid symlinks.
1 parent 659118c commit 6cde79d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+61
-2908
lines changed

MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,19 @@ swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "sw
2525
use_repo(
2626
swift_cc_toolchain_ext,
2727
"aarch64-darwin-llvm",
28+
"aarch64-darwin-llvm20",
2829
"aarch64-linux-llvm",
30+
"aarch64-linux-llvm20",
2931
"aarch64-linux-musl",
3032
"aarch64-sysroot",
3133
"arm-linux-musleabihf",
3234
"darwin_gcc_arm_embedded_toolchain",
3335
"gcc_arm_gnu_8_3_toolchain",
3436
"llvm_mingw_toolchain",
3537
"x86_64-darwin-llvm",
38+
"x86_64-darwin-llvm20",
3639
"x86_64-linux-llvm",
40+
"x86_64-linux-llvm20",
3741
"x86_64-linux-musl",
3842
"x86_64-sysroot",
3943
"x86_64_linux_gcc_arm_embedded_toolchain",

cc/extensions.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ load(
1010
"gcc_arm_gnu_8_3_toolchain",
1111
"llvm_mingw_toolchain",
1212
"swift_cc_toolchain",
13+
"swift_cc_toolchain_llvm20",
1314
"x86_64_linux_musl_toolchain",
1415
"x86_64_sysroot",
1516
)
1617

1718
def _swift_cc_toolchain_impl(_ctx):
1819
swift_cc_toolchain()
20+
swift_cc_toolchain_llvm20()
1921
aarch64_sysroot()
2022
llvm_mingw_toolchain()
2123
x86_64_sysroot()

cc/toolchains/llvm20/aarch64-darwin/wrappers/clang

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wrapper

cc/toolchains/llvm20/aarch64-darwin/wrappers/clang-cpp

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wrapper

cc/toolchains/llvm20/aarch64-darwin/wrappers/llvm-cov

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wrapper

cc/toolchains/llvm20/aarch64-darwin/wrappers/llvm-nm

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wrapper

0 commit comments

Comments
 (0)