File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -13,22 +13,22 @@ load(
13
13
load ("//ruby/private:utils.bzl" , _is_windows = "is_windows" )
14
14
15
15
def _rb_gem_build_impl (ctx ):
16
- tools = depset ([])
17
-
18
16
gem_builder = ctx .actions .declare_file ("{}_gem_builder.rb" .format (ctx .label .name ))
19
17
transitive_data = get_transitive_data (ctx .files .data , ctx .attr .deps ).to_list ()
20
18
transitive_deps = get_transitive_deps (ctx .attr .deps ).to_list ()
21
19
transitive_srcs = get_transitive_srcs (ctx .files .srcs , ctx .attr .deps ).to_list ()
22
20
bundle_env = get_bundle_env ({}, ctx .attr .deps )
23
21
java_toolchain = ctx .toolchains ["@bazel_tools//tools/jdk:runtime_toolchain_type" ]
24
22
ruby_toolchain = ctx .toolchains ["@rules_ruby//ruby:toolchain_type" ]
23
+ tools = []
24
+ tools .extend (ruby_toolchain .files )
25
25
26
26
env = {}
27
27
env .update (ruby_toolchain .env )
28
28
29
29
if ruby_toolchain .version .startswith ("jruby" ):
30
30
env ["JAVA_HOME" ] = java_toolchain .java_runtime .java_home
31
- tools = java_toolchain .java_runtime .files
31
+ tools . extend ( java_toolchain .java_runtime .files . to_list ())
32
32
if _is_windows (ctx ):
33
33
env ["PATH" ] = ruby_toolchain .ruby .dirname
34
34
@@ -66,8 +66,7 @@ def _rb_gem_build_impl(ctx):
66
66
arguments = [args ],
67
67
env = env ,
68
68
mnemonic = "GemBuild" ,
69
- tools = tools ,
70
- use_default_shell_env = not _is_windows (ctx ),
69
+ tools = depset (tools ),
71
70
)
72
71
73
72
providers = []
You can’t perform that action at this time.
0 commit comments