Skip to content

Commit f8feda4

Browse files
committed
fix: Update bazel + toolchains_llvm
Bazel 7 is required for toolchains_llvm 1.0.0, which fixes a CI build error with the linker: ``` /private/var/tmp/_bazel_runner/f7b5b126cb65bf12475e292acf07553d/sandbox/darwin-sandbox/8/execroot/proxy_wasm_cpp_host/external/llvm_toolchain/bin/cc_wrapper.sh: line 58: rpath/libiwasm.dylib: No such file or directory ninja: build stopped: subcommand failed. _____ END BUILD LOGS _____ ``` Signed-off-by: Matt Leon <[email protected]>
1 parent aa76216 commit f8feda4

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5.0
1+
7.0.0

bazel/dependencies.bzl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,6 @@ def proxy_wasm_cpp_host_dependencies():
5959
llvm_toolchain(
6060
name = "llvm_toolchain",
6161
llvm_version = "19.1.0",
62-
sha256 = {
63-
"linux-x86_64": "cee77d641690466a193d9b88c89705de1c02bbad46bde6a3b126793c0a0f2923",
64-
"linux-aarch64": "7bb54afd330fe1a1c2d4c593fa1e2dbe2abd9bf34fb3597994ff41e443cf144b",
65-
"darwin-aarch64": "9da86f64a99f5ce9b679caf54e938736ca269c5e069d0c94ad08b995c5f25c16",
66-
"darwin-x86_64": "264f2f1e8b67f066749349ae8b4943d346cd44e099464164ef21b42a57663540",
67-
},
68-
strip_prefix = {
69-
"linux-x86_64": "LLVM-19.1.0-Linux-X64",
70-
"linux-aarch64": "clang+llvm-19.1.0-aarch64-linux-gnu",
71-
"darwin-aarch64": "LLVM-19.1.0-macOS-ARM64",
72-
"darwin-x86_64": "LLVM-19.1.0-macOS-X64",
73-
},
74-
urls = {
75-
"linux-x86_64": ["https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/LLVM-19.1.0-Linux-X64.tar.xz"],
76-
"linux-aarch64": ["https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/clang+llvm-19.1.0-aarch64-linux-gnu.tar.xz"],
77-
"darwin-aarch64": ["https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/LLVM-19.1.0-macOS-ARM64.tar.xz"],
78-
"darwin-x86_64": ["https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/LLVM-19.1.0-macOS-X64.tar.xz"],
79-
},
8062
)
8163

8264
llvm_toolchain(

bazel/repositories.bzl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,14 @@ def proxy_wasm_cpp_host_repositories():
6565
strip_prefix = "toolshed-bazel-bins-v0.1.13/bazel",
6666
url = "https://github.com/envoyproxy/toolshed/archive/refs/tags/bazel-bins-v0.1.13.tar.gz",
6767
)
68+
6869
maybe(
6970
http_archive,
7071
name = "toolchains_llvm",
71-
sha256 = "b7cd301ef7b0ece28d20d3e778697a5e3b81828393150bed04838c0c52963a01",
72-
strip_prefix = "toolchains_llvm-0.10.3",
73-
canonical_id = "v0.10.3",
74-
url = "https://github.com/grailbio/bazel-toolchain/releases/download/0.10.3/toolchains_llvm-0.10.3.tar.gz",
72+
sha256 = "fded02569617d24551a0ad09c0750dc53a3097237157b828a245681f0ae739f8",
73+
strip_prefix = "toolchains_llvm-v1.4.0",
74+
canonical_id = "v1.4.0",
75+
url = "https://github.com/bazel-contrib/toolchains_llvm/releases/download/v1.4.0/toolchains_llvm-v1.4.0.tar.gz",
7576
)
7677

7778
maybe(

bazel/wasm.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ def _wasm_attrs(transition):
6464
"binary": attr.label(mandatory = True, cfg = transition),
6565
"signing_key": attr.label_list(allow_files = True),
6666
"_wasmsign_tool": attr.label(default = "//bazel/cargo/wasmsign/remote:wasmsign__wasmsign", executable = True, cfg = "exec"),
67-
"_whitelist_function_transition": attr.label(default = "@bazel_tools//tools/whitelists/function_transition_whitelist"),
6867
}
6968

7069
wasm_rust_binary_rule = rule(

0 commit comments

Comments
 (0)