Fix some cross compilation scenarios in test runner

Author: afonso360

build_system/build_sysroot.rs

@@ -23,7 +23,7 @@ pub(crate) fn build_sysroot(
     fs::create_dir_all(target_dir.join("lib")).unwrap();
 
     // Copy the backend
-    let cg_clif_dylib = get_file_name("rustc_codegen_cranelift", "dylib", target_triple);
+    let cg_clif_dylib = get_file_name("rustc_codegen_cranelift", "dylib", host_triple);
     let cg_clif_dylib_path = target_dir
         .join(if cfg!(windows) {
             // Windows doesn't have rpath support, so the cg_clif dylib needs to be next to the
@@ -37,7 +37,7 @@ pub(crate) fn build_sysroot(
 
     // Build and copy rustc and cargo wrappers
     for wrapper in ["rustc-clif", "cargo-clif"] {
-        let wrapper_name = get_wrapper_file_name(wrapper, "bin", target_triple);
+        let wrapper_name = get_wrapper_file_name(wrapper, "bin", host_triple);
 
         let mut build_cargo_wrapper_cmd = Command::new("rustc");
         build_cargo_wrapper_cmd

build_system/tests.rs

@@ -414,7 +414,7 @@ impl TestRunner {
     {
         let mut rustc_clif = self.root_dir.clone();
         rustc_clif.push("build");
-        rustc_clif.push(get_wrapper_file_name("rustc-clif", "bin", &self.target_triple));
+        rustc_clif.push(get_wrapper_file_name("rustc-clif", "bin", &self.host_triple));
 
         let mut cmd = Command::new(rustc_clif);
         if !self.rust_flags.is_empty() {
@@ -476,7 +476,7 @@ impl TestRunner {
     {
         let mut cargo_clif = self.root_dir.clone();
         cargo_clif.push("build");
-        cargo_clif.push(get_wrapper_file_name("cargo-clif", "bin", &self.target_triple));
+        cargo_clif.push(get_wrapper_file_name("cargo-clif", "bin", &self.host_triple));
 
         let mut cmd = Command::new(cargo_clif);
         cmd.args(args);