Use override Ruby toolchain consistently

bazel-contrib · Jul 23, 2024 · 905c0cb · 905c0cb
1 parent 8b542cd
commit 905c0cb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/docs/rules.md b/docs/rules.md
diff --git a/ruby/private/binary.bzl b/ruby/private/binary.bzl
@@ -138,6 +138,8 @@ def rb_binary_impl(ctx):
     transitive_srcs = get_transitive_srcs(ctx.files.srcs, ctx.attr.deps).to_list()
 
     ruby_toolchain = ctx.toolchains["@rules_ruby//ruby:toolchain_type"]
+    if ctx.attr.ruby != None:
+        ruby_toolchain = ctx.attr.ruby[platform_common.ToolchainInfo]
     tools = [ctx.file._runfiles_library]
     tools.extend(ruby_toolchain.files)
 

diff --git a/ruby/private/gem_build.bzl b/ruby/private/gem_build.bzl
@@ -1,5 +1,6 @@
 "Implementation details for rb_gem_build"
 
+load("//ruby/private:binary.bzl", BINARY_ATTRS = "ATTRS")
 load("//ruby/private:library.bzl", LIBRARY_ATTRS = "ATTRS")
 load(
     "//ruby/private:providers.bzl",
@@ -20,6 +21,8 @@ def _rb_gem_build_impl(ctx):
     bundle_env = get_bundle_env({}, ctx.attr.deps)
     java_toolchain = ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"]
     ruby_toolchain = ctx.toolchains["@rules_ruby//ruby:toolchain_type"]
+    if ctx.attr.ruby != None:
+        ruby_toolchain = ctx.attr.ruby[platform_common.ToolchainInfo]
     tools = []
     tools.extend(ruby_toolchain.files)
 
@@ -97,6 +100,7 @@ rb_gem_build = rule(
     _rb_gem_build_impl,
     attrs = dict(
         LIBRARY_ATTRS,
+        ruby = BINARY_ATTRS["ruby"],
         gemspec = attr.label(
             allow_single_file = [".gemspec"],
             mandatory = True,

diff --git a/ruby/private/gem_push.bzl b/ruby/private/gem_push.bzl
@@ -7,6 +7,8 @@ def _rb_gem_push_impl(ctx):
     env = {}
     java_toolchain = ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"]
     ruby_toolchain = ctx.toolchains["@rules_ruby//ruby:toolchain_type"]
+    if ctx.attr.ruby != None:
+        ruby_toolchain = ctx.attr.ruby[platform_common.ToolchainInfo]
     srcs = [ctx.file.gem]
     tools = [ruby_toolchain.gem, ctx.file._runfiles_library]