Reuse rules_rust compile helper for Miri host builds

Author: dzbarsky

rs/experimental/miri/BUILD.bazel

@@ -20,25 +20,6 @@ bzl_library(
         "//rs/experimental/miri/private:compile",
         "//rs/experimental/miri/private:providers",
         "//rs/experimental/miri/private:toolchain",
-        "@bazel_features//:features",
         "@hermetic_launcher//launcher:lib_bzl",
     ],
 )
-
-bzl_library(
-    name = "module_extension",
-    srcs = ["module_extension.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//rs/platforms:triples",
-        "//rs/private:cargo_repository",
-        "//rs/private:miri_repository",
-        "//rs/private:module_extension_utils",
-        "//rs/private:rustc_repository",
-        "//rs/private:rustc_src_repository",
-        "//rs/private:stdlib_repository",
-        "//rs/toolchains:toolchain_utils",
-        "@rules_rust//rust/platform:bzl_lib",
-        "@rules_rust//rust/private:bzl_lib",
-    ],
-)

rs/experimental/miri/miri_test.bzl

@@ -29,19 +29,20 @@ def _dirname(path):
     return path[:idx] if idx != -1 else "."
 
 def _short_dependency_search_dir_arg(file):
-    return "-Ldependency=" + _dirname(file.short_path)
+    return "dependency=" + _dirname(file.short_path)
 
 def _direct_deps(ctx):
     direct_deps = []
     for dep in ctx.attr.deps:
         if MiriCrateInfo not in dep:
             continue
         miri_dep = dep[MiriCrateInfo]
+        compiled_crate = miri_dep.target
         direct_deps.append(struct(
             name = alias_for_dep(ctx.attr.aliases, dep, miri_dep.crate_info),
-            output = miri_dep.output,
-            transitive_inputs = miri_dep.transitive_inputs,
-            transitive_outputs = miri_dep.transitive_outputs,
+            output = compiled_crate.output,
+            transitive_inputs = compiled_crate.transitive_inputs,
+            transitive_outputs = compiled_crate.transitive_outputs,
         ))
     return direct_deps
 
@@ -133,6 +134,7 @@ def _write_runner_args(ctx, toolchain, crate_root, crate_name, direct_deps):
     args.add_all(direct_deps, map_each = _extern_arg)
     args.add_all(
         miri_transitive_outputs(direct_deps),
+        before_each = "-L",
         map_each = _short_dependency_search_dir_arg,
         uniquify = True,
     )

rs/experimental/miri/module_extension.bzl

@@ -27,10 +27,11 @@ bzl_library(
     deps = [
         ":providers",
         ":toolchain",
-        "@bazel_tools//tools/build_defs/cc:action_names.bzl",
-        "@rules_cc//cc:find_cc_toolchain.bzl",
-        "@rules_cc//cc/common:cc_common.bzl",
+        "@bazel_skylib//lib:structs",
+        "@rules_cc//cc/common",
         "@rules_rust//rust:bzl_lib",
+        "@rules_rust//rust/platform:bzl_lib",
+        "@rules_rust//rust/private:bzl_lib",
     ],
 )