From bbc89b2512e8ec9ee5e16d4faa88a69aa35c6754 Mon Sep 17 00:00:00 2001
From: Hideki Sekine <sekineh@me.com>
Date: Wed, 18 Jul 2018 00:40:55 +0900
Subject: [PATCH] Fix rust issue #52163

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

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 6254f981656..12a845c3d6d 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -966,7 +966,9 @@ impl Step for Compiletest {
             builder.ensure(compile::Rustc { compiler, target });
         }
 
-        builder.ensure(compile::Test { compiler, target });
+        if builder.no_std(target) == Some(false) {
+            builder.ensure(compile::Test { compiler, target });
+        }
         builder.ensure(native::TestHelpers { target });
         builder.ensure(RemoteCopyLibs { compiler, target });