Skip to content

Commit 3bb560a

Browse files
authored
Fix windows to properly detect and pick x86 vs arm64 (#31)
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
1 parent 67b15ee commit 3bb560a

6 files changed

Lines changed: 120 additions & 25 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module(
77
bazel_dep(name = "platforms", version = "0.0.9")
88
bazel_dep(name = "rules_cc", version = "0.0.9")
99
bazel_dep(name = "rules_java", version = "7.6.5")
10-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr2")
10+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr4")
1111

1212
setup_bzlmodrio_libssh_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_libssh_cpp_dependencies")
1313
use_repo(

MODULE.bazel.lock

Lines changed: 31 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WORKSPACE

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,37 @@ load("@bzlmodrio-libssh//private/non_bzlmod_dependencies:download_dependencies.b
44

55
download_dependencies()
66

7+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
8+
9+
bazel_features_deps()
10+
11+
load("@rules_cc//cc:repositories.bzl", "rules_cc_toolchains")
12+
13+
rules_cc_toolchains()
14+
15+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
16+
17+
rules_java_dependencies()
18+
19+
# note that the following line is what is minimally required from protobuf for the java rules
20+
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
21+
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
22+
23+
proto_bazel_features(name = "proto_bazel_features")
24+
25+
# register toolchains
26+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
27+
28+
rules_java_toolchains()
29+
30+
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
31+
32+
rules_jvm_external_deps()
33+
34+
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
35+
36+
rules_jvm_external_setup()
37+
738
load("@bzlmodrio-libssh//private/non_bzlmod_dependencies:setup_dependencies.bzl", "setup_dependencies")
839

940
setup_dependencies()

0 commit comments

Comments
 (0)