forward the bootstrap runner to run-make

The runner was already forwarded to `compiletest`, this just passes it on to `run-make` and uses it in the `run` functions.

Author: folkertdev

src/tools/compiletest/src/runtest/run_make.rs

@@ -221,6 +221,10 @@ impl TestCx<'_> {
             cmd.env("REMOTE_TEST_CLIENT", remote_test_client);
         }
 
+        if let Some(runner) = &self.config.runner {
+            cmd.env("RUNNER", runner);
+        }
+
         // We don't want RUSTFLAGS set from the outside to interfere with
         // compiler flags set in the test cases:
         cmd.env_remove("RUSTFLAGS");

src/tools/run-make-support/src/run.rs

@@ -1,4 +1,4 @@
-use std::ffi::OsStr;
+use std::ffi::{OsStr, OsString};
 use std::path::PathBuf;
 use std::{env, panic};
 
@@ -21,6 +21,20 @@ fn run_common(name: &str, args: Option<&[&str]>) -> Command {
         // will have to be changed (and the support files will have to be uploaded).
         cmd.arg("0");
         cmd.arg(bin_path);
+        cmd
+    } else if let Ok(runner) = std::env::var("RUNNER") {
+        let mut args = split_maybe_args(&runner);
+
+        let prog = args.remove(0);
+        let mut cmd = Command::new(prog);
+
+        for arg in args {
+            cmd.arg(arg);
+        }
+
+        cmd.arg("--");
+        cmd.arg(bin_path);
+
         cmd
     } else {
         Command::new(bin_path)
@@ -92,3 +106,11 @@ pub fn cmd<S: AsRef<OsStr>>(program: S) -> Command {
     command.env("LC_ALL", "C"); // force english locale
     command
 }
+
+fn split_maybe_args(s: &str) -> Vec<OsString> {
+    s.split(' ')
+        .filter_map(|s| {
+            if s.chars().all(|c| c.is_whitespace()) { None } else { Some(OsString::from(s)) }
+        })
+        .collect()
+}

tests/run-make/c-link-to-rust-va-list-fn/rmake.rs

@@ -3,12 +3,10 @@
 // prevent the creation of a functional binary.
 // See https://github.com/rust-lang/rust/pull/49878
 
-//@ ignore-cross-compile
-
-use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name};
+use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name, target};
 
 fn main() {
-    rustc().input("checkrust.rs").run();
+    rustc().input("checkrust.rs").target(target()).run();
     cc().input("test.c")
         .input(static_lib_name("checkrust"))
         .out_exe("test")