Cleanups and fixes throughout

Author: Mark-Simulacrum

src/bootstrap/check.rs

@@ -550,7 +550,7 @@ impl<'a> Step<'a> for Compiletest<'a> {
 
             builder.ensure(dist::DebuggerScripts {
                 sysroot: &builder.sysroot(compiler),
-                host: compiler.host
+                target: target
             });
 
             if mode == "debuginfo-gdb" {
@@ -1274,7 +1274,7 @@ impl<'a> Step<'a> for RemoteCopyLibs<'a> {
         println!("REMOTE copy libs to emulator ({})", target);
         t!(fs::create_dir_all(build.out.join("tmp")));
 
-        let server = builder.ensure(tool::RemoteTestServer { compiler, target }));
+        let server = builder.ensure(tool::RemoteTestServer { stage: compiler.stage, target });
 
         // Spawn the emulator and wait for it to come online
         let tool = builder.tool_exe(Tool::RemoteTestClient);
@@ -1316,9 +1316,6 @@ impl<'a> Step<'a> for Distcheck {
     fn run(self, builder: &Builder) {
         let build = builder.build;
 
-        builder.ensure(dist::PlainSourceTarball);
-        builder.ensure(dist::Src);
-
         if build.build != "x86_64-unknown-linux-gnu" {
             return
         }
@@ -1336,7 +1333,7 @@ impl<'a> Step<'a> for Distcheck {
 
         let mut cmd = Command::new("tar");
         cmd.arg("-xzf")
-           .arg(dist::rust_src_location(build))
+           .arg(builder.ensure(dist::PlainSourceTarball))
            .arg("--strip-components=1")
            .current_dir(&dir);
         build.run(&mut cmd);
@@ -1356,7 +1353,7 @@ impl<'a> Step<'a> for Distcheck {
 
         let mut cmd = Command::new("tar");
         cmd.arg("-xzf")
-           .arg(dist::rust_src_installer(build))
+           .arg(builder.ensure(dist::Src))
            .arg("--strip-components=1")
            .current_dir(&dir);
         build.run(&mut cmd);

src/bootstrap/compile.rs

@@ -364,24 +364,21 @@ impl<'a> Step<'a> for StartupObjects<'a> {
             return
         }
 
-        let compiler = builder.compiler(0, &build.build);
-        let compiler_path = builder.rustc(compiler);
         let src_dir = &build.src.join("src/rtstartup");
         let dst_dir = &build.native_dir(target).join("rtstartup");
         let sysroot_dir = &builder.sysroot_libdir(for_compiler, target);
         t!(fs::create_dir_all(dst_dir));
-        t!(fs::create_dir_all(sysroot_dir));
 
         for file in &["rsbegin", "rsend"] {
             let src_file = &src_dir.join(file.to_string() + ".rs");
             let dst_file = &dst_dir.join(file.to_string() + ".o");
             if !up_to_date(src_file, dst_file) {
-                let mut cmd = Command::new(&compiler_path);
+                let mut cmd = Command::new(&build.initial_rustc);
                 build.run(cmd.env("RUSTC_BOOTSTRAP", "1")
-                            .arg("--cfg").arg(format!("stage{}", compiler.stage))
+                            .arg("--cfg").arg("stage0")
                             .arg("--target").arg(target)
                             .arg("--emit=obj")
-                            .arg("--out-dir").arg(dst_dir)
+                            .arg("--o").arg(dst_file)
                             .arg(src_file));
             }