Auto merge of #43430 - Mark-Simulacrum:rustbuild-fixes, r=alexcrichton

Rustbuild regression fixes I believe this will fix #43427. This PR also avoids running pretty tests by-default. r? @alexcrichton
rust-lang · Jul 24, 2017 · b80e946 · b80e946
2 parents 5669c99 + fef9b48
commit b80e946
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 88 deletions.
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
@@ -458,6 +458,9 @@ impl Step for HostCompiletest {
             });
         } else {
             for test in HOST_COMPILETESTS {
+                if test.mode == "pretty" {
+                    continue;
+                }
                 run.builder.ensure(HostCompiletest {
                     compiler,
                     target: run.target,
@@ -532,7 +535,7 @@ impl Step for Compiletest {
 
             builder.ensure(dist::DebuggerScripts {
                 sysroot: builder.sysroot(compiler),
-                target: target
+                host: target
             });
         }