Skip to content

Commit dbe853e

Browse files
committed
bzlmod: fix wamr-jit build
Signed-off-by: Matt Leon <mattleon@google.com>
1 parent 2dfc5ba commit dbe853e

5 files changed

Lines changed: 321 additions & 3342 deletions

File tree

MODULE.bazel

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bazel_dep(name = "aspect_rules_lint", version = "1.13.0")
3838
archive_override(
3939
module_name = "rules_rust",
4040
integrity = "sha256-yKqAbPYGZnmsI0YyQe6ArWkiZdrQRl9RERy74wuJA1I=",
41-
patch_args = ["-p1"],
41+
patch_strip = 1,
4242
patches = ["@proxy_wasm_cpp_host//bazel/external:rules_rust.patch"],
4343
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.68.1/rules_rust-0.68.1.tar.gz"],
4444
)
@@ -58,11 +58,8 @@ archive_override(
5858

5959
# Configure and register the toolchain.
6060
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
61-
llvm.toolchain(
62-
llvm_version = "19.1.0",
63-
)
61+
llvm.toolchain(llvm_version = "19.1.0")
6462
use_repo(llvm, "llvm_toolchain", "llvm_toolchain_llvm")
65-
6663
register_toolchains("@llvm_toolchain//:all")
6764

6865
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
@@ -102,21 +99,15 @@ use_repo(wasmtime, "com_github_bytecodealliance_wasmtime")
10299
wamr = use_extension("//bazel:extensions.bzl", "wamr")
103100
use_repo(wamr, "com_github_bytecodealliance_wasm_micro_runtime")
104101

102+
wamr_jit_deps = use_extension("//bazel:extensions.bzl", "wamr_jit_deps")
103+
use_repo(wamr_jit_deps, "llvm-raw", "llvm_zlib", "llvm_zstd")
104+
llvm_configure = use_repo_rule("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure")
105+
llvm_configure(name = "llvm-project", targets = ["X86", "AArch64"])
106+
105107
# V8 runtime and its dependencies
106108
v8 = use_extension("//bazel:extensions.bzl", "v8")
107109
use_repo(v8, "v8")
108110

109-
v8_deps = use_extension("//bazel:extensions.bzl", "v8_deps")
110-
use_repo(
111-
v8_deps,
112-
"dragonbox",
113-
"fast_float",
114-
"fp16",
115-
"highway",
116-
"intel_ittapi",
117-
"simdutf",
118-
)
119-
120111
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
121112
pip.parse(
122113
extra_pip_args = ["--require-hashes"],

0 commit comments

Comments
 (0)