Run ruby_binary with the interpreter in a SDK again

when the interpreter is not the host interpreter

Author: yugui

ruby/private/binary.bzl

@@ -40,22 +40,39 @@ def _ruby_binary_impl(ctx):
     deps = _transitive_deps(
         ctx,
         extra_files = interpreter_file_deps + [executable],
-        extra_deps = interpreter_trans_deps,
+        extra_deps = interpreter_trans_deps + ctx.attr._misc_deps,
     )
 
     rubyopt = reversed(deps.rubyopt.to_list())
-
+    intermediate_executable = ctx.actions.declare_file("%s.tpl.intermediate" % ctx.attr.name)
     ctx.actions.expand_template(
         template = ctx.file._wrapper_template,
-        output = executable,
+        output = intermediate_executable,
         substitutions = {
-            "{interpreter}": interpreter.short_path,
             "{loadpaths}": repr(deps.incpaths.to_list()),
             "{rubyopt}": repr(rubyopt),
             "{main}": repr(_to_manifest_path(ctx, main)),
+            "{interpreter}": _to_manifest_path(ctx, interpreter),
         },
-        is_executable = True,
     )
+    if sdk.is_host:
+        ctx.actions.run_shell(
+            inputs = [intermediate_executable],
+            outputs = [executable],
+            command = "grep -v '^#shell ' %s > %s" % (
+                intermediate_executable.path,
+                executable.path,
+            ),
+        )
+    else:
+        ctx.actions.run_shell(
+            inputs = [intermediate_executable],
+            outputs = [executable],
+            command = "sed 's/^#shell //' %s > %s" % (
+                intermediate_executable.path,
+                executable.path,
+            ),
+        )
     return [DefaultInfo(
         executable = executable,
         default_runfiles = deps.default_files,
@@ -81,6 +98,10 @@ _ATTRS = {
         allow_single_file = True,
         default = "binary_wrapper.tpl",
     ),
+    "_misc_deps": attr.label_list(
+        allow_files = True,
+        default = ["@bazel_tools//tools/bash/runfiles"],
+    ),
 }
 
 ruby_binary = rule(

ruby/private/binary_wrapper.tpl

@@ -1,3 +1,8 @@
+#shell #!/usr/bin/env bash
+#shell # This conditional is evaluated as true in Ruby, false in shell
+#shell if [ ]; then
+#shell eval <<'END_OF_RUBY'
+#shell # -- begin Ruby --
 #!/usr/bin/env ruby
 
 # Ruby-port of the Bazel's wrapper script for Python
@@ -124,3 +129,21 @@ end
 if __FILE__ == $0
   main(ARGV)
 end
+#shell END_OF_RUBY
+#shell __END__
+#shell # -- end Ruby --
+#shell fi
+#shell # -- begin Shell Script --
+#shell 
+#shell # --- begin runfiles.bash initialization v2 ---
+#shell # Copy-pasted from the Bazel Bash runfiles library v2.
+#shell set -uo pipefail; f=bazel_tools/tools/bash/runfiles/runfiles.bash
+#shell source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
+#shell source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
+#shell source "$0.runfiles/$f" 2>/dev/null || \
+#shell source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+#shell source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+#shell { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
+#shell # --- end runfiles.bash initialization v2 ---
+#shell 
+#shell exec "$(rlocation {interpreter})" ${BASH_SOURCE:-$0} "$@"