bootstrap: provide host rust_test_helpers to compiletest, not just …

…target.
Centril · Nov 30, 2018 · 3a04d44 · 3a04d44
1 parent 840c301
commit 3a04d44
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -978,6 +978,8 @@ impl Step for Compiletest {
 
         // HACK(eddyb) ensure that `libproc_macro` is available on the host.
         builder.ensure(compile::Test { compiler, target: compiler.host });
+        // Also provide `rust_test_helpers` for the host.
+        builder.ensure(native::TestHelpers { target: compiler.host });
 
         builder.ensure(native::TestHelpers { target });
         builder.ensure(RemoteCopyLibs { compiler, target });
@@ -1046,7 +1048,11 @@ impl Step for Compiletest {
             cmd.arg("--linker").arg(linker);
         }
 
-        let hostflags = flags.clone();
+        let mut hostflags = flags.clone();
+        hostflags.push(format!(
+            "-Lnative={}",
+            builder.test_helpers_out(compiler.host).display()
+        ));
         cmd.arg("--host-rustcflags").arg(hostflags.join(" "));
 
         let mut targetflags = flags;