From 3a04d448f935dcd8ed0e5ff98e776431196a4ece Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <edy.burt@gmail.com>
Date: Tue, 27 Nov 2018 15:40:40 +0200
Subject: [PATCH] bootstrap: provide host `rust_test_helpers` to compiletest,
 not just target.

---
 src/bootstrap/test.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 08672c1fc93..e6c260a1426 100644
--- 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;