Remove build from Build

rust-lang · Mark-Simulacrum · Feb 11, 2018 · Feb 11, 2018 · Feb 11, 2018 · Feb 11, 2018
commit 13d97f3f12dbe57eb8d157dd8bdbc27a82b9decb
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -495,7 +495,7 @@ impl<'a> Builder<'a> {
         let compiler = self.compiler(self.top_stage, host);
         cmd.env("RUSTC_STAGE", compiler.stage.to_string())
            .env("RUSTC_SYSROOT", self.sysroot(compiler))
-           .env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
+           .env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.build.config.build))
            .env("CFG_RELEASE_CHANNEL", &self.build.config.channel)
            .env("RUSTDOC_REAL", self.rustdoc(host))
            .env("RUSTDOC_CRATE_VERSION", self.build.rust_version())
@@ -589,7 +589,7 @@ impl<'a> Builder<'a> {
             cargo.env("RUSTC_ERROR_FORMAT", error_format);
         }
         if cmd != "build" && cmd != "check" {
-            cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.build)));
+            cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.config.build)));
         }
 
         if mode != Mode::Tool {

diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
@@ -38,7 +38,7 @@ impl Step for Std {
     fn run(self, builder: &Builder) {
         let build = builder.build;
         let target = self.target;
-        let compiler = builder.compiler(0, build.build);
+        let compiler = builder.compiler(0, build.config.build);
 
         let _folder = build.fold_output(|| format!("stage{}-std", compiler.stage));
         println!("Checking std artifacts ({} -> {})", &compiler.host, target);
@@ -83,7 +83,7 @@ impl Step for Rustc {
     /// created will also be linked into the sysroot directory.
     fn run(self, builder: &Builder) {
         let build = builder.build;
-        let compiler = builder.compiler(0, build.build);
+        let compiler = builder.compiler(0, build.config.build);
         let target = self.target;
 
         let _folder = build.fold_output(|| format!("stage{}-rustc", compiler.stage));
@@ -126,7 +126,7 @@ impl Step for Test {
     fn run(self, builder: &Builder) {
         let build = builder.build;
         let target = self.target;
-        let compiler = builder.compiler(0, build.build);
+        let compiler = builder.compiler(0, build.config.build);
 
         let _folder = build.fold_output(|| format!("stage{}-test", compiler.stage));
         println!("Checking test artifacts ({} -> {})", &compiler.host, target);

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -71,7 +71,7 @@ impl Step for Std {
         builder.ensure(StartupObjects { compiler, target });
 
         if build.force_use_stage1(compiler, target) {
-            let from = builder.compiler(1, build.build);
+            let from = builder.compiler(1, build.config.build);
             builder.ensure(Std {
                 compiler: from,
                 target,
@@ -112,7 +112,7 @@ impl Step for Std {
                   false);
 
         builder.ensure(StdLink {
-            compiler: builder.compiler(compiler.stage, build.build),
+            compiler: builder.compiler(compiler.stage, build.config.build),
             target_compiler: compiler,
             target,
         });
@@ -344,12 +344,12 @@ impl Step for Test {
 
         if build.force_use_stage1(compiler, target) {
             builder.ensure(Test {
-                compiler: builder.compiler(1, build.build),
+                compiler: builder.compiler(1, build.config.build),
                 target,
             });
-            println!("Uplifting stage1 test ({} -> {})", &build.build, target);
+            println!("Uplifting stage1 test ({} -> {})", &build.config.build, target);
             builder.ensure(TestLink {
-                compiler: builder.compiler(1, build.build),
+                compiler: builder.compiler(1, build.config.build),
                 target_compiler: compiler,
                 target,
             });
@@ -369,7 +369,7 @@ impl Step for Test {
                   false);
 
         builder.ensure(TestLink {
-            compiler: builder.compiler(compiler.stage, build.build),
+            compiler: builder.compiler(compiler.stage, build.config.build),
             target_compiler: compiler,
             target,
         });
@@ -460,12 +460,12 @@ impl Step for Rustc {
 
         if build.force_use_stage1(compiler, target) {
             builder.ensure(Rustc {
-                compiler: builder.compiler(1, build.build),
+                compiler: builder.compiler(1, build.config.build),
                 target,
             });
-            println!("Uplifting stage1 rustc ({} -> {})", &build.build, target);
+            println!("Uplifting stage1 rustc ({} -> {})", &build.config.build, target);
             builder.ensure(RustcLink {
-                compiler: builder.compiler(1, build.build),
+                compiler: builder.compiler(1, build.config.build),
                 target_compiler: compiler,
                 target,
             });
@@ -474,8 +474,8 @@ impl Step for Rustc {
 
         // Ensure that build scripts have a std to link against.
         builder.ensure(Std {
-            compiler: builder.compiler(self.compiler.stage, build.build),
-            target: build.build,
+            compiler: builder.compiler(self.compiler.stage, build.config.build),
+            target: build.config.build,
         });
 
         let _folder = build.fold_output(|| format!("stage{}-rustc", compiler.stage));
@@ -494,7 +494,7 @@ impl Step for Rustc {
                   false);
 
         builder.ensure(RustcLink {
-            compiler: builder.compiler(compiler.stage, build.build),
+            compiler: builder.compiler(compiler.stage, build.config.build),
             target_compiler: compiler,
             target,
         });
@@ -616,7 +616,7 @@ impl Step for CodegenBackend {
 
         if build.force_use_stage1(compiler, target) {
             builder.ensure(CodegenBackend {
-                compiler: builder.compiler(1, build.build),
+                compiler: builder.compiler(1, build.config.build),
                 target,
                 backend: self.backend,
             });
@@ -840,7 +840,7 @@ impl Step for Assemble {
         let target_compiler = self.target_compiler;
 
         if target_compiler.stage == 0 {
-            assert_eq!(build.build, target_compiler.host,
+            assert_eq!(build.config.build, target_compiler.host,
                 "Cannot obtain compiler for non-native build triple at stage 0");
             // The stage 0 compiler for the build triple is always pre-built.
             return target_compiler;
@@ -863,7 +863,7 @@ impl Step for Assemble {
         // FIXME: It may be faster if we build just a stage 1 compiler and then
         //        use that to bootstrap this compiler forward.
         let build_compiler =
-            builder.compiler(target_compiler.stage - 1, build.build);
+            builder.compiler(target_compiler.stage - 1, build.config.build);
 
         // Build the libraries for this compiler to link to (i.e., the libraries
         // it uses at runtime). NOTE: Crates the target compiler compiles don't

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -122,7 +122,7 @@ impl Step for Docs {
 
         // As part of this step, *also* copy the docs directory to a directory which
         // buildbot typically uploads.
-        if host == build.build {
+        if host == build.config.build {
             let dst = distdir(build).join("doc").join(build.rust_package_vers());
             t!(fs::create_dir_all(&dst));
             cp_r(&src, &dst);
@@ -549,7 +549,7 @@ impl Step for Std {
 
     fn make_run(run: RunConfig) {
         run.builder.ensure(Std {
-            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
+            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.config.build),
             target: run.target,
         });
     }
@@ -564,7 +564,7 @@ impl Step for Std {
 
         // The only true set of target libraries came from the build triple, so
         // let's reduce redundant work by only producing archives from that host.
-        if compiler.host != build.build {
+        if compiler.host != build.config.build {
             println!("\tskipping, not a build host");
             return distdir(build).join(format!("{}-{}.tar.gz", name, target));
         }
@@ -623,7 +623,7 @@ impl Step for Analysis {
 
     fn make_run(run: RunConfig) {
         run.builder.ensure(Analysis {
-            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
+            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.config.build),
             target: run.target,
         });
     }
@@ -637,7 +637,7 @@ impl Step for Analysis {
         println!("Dist analysis");
         let name = pkgname(build, "rust-analysis");
 
-        if &compiler.host != build.build {
+        if &compiler.host != build.config.build {
             println!("\tskipping, not a build host");
             return distdir(build).join(format!("{}-{}.tar.gz", name, target));
         }
@@ -1012,7 +1012,7 @@ impl Step for Cargo {
         t!(fs::create_dir_all(image.join("share/zsh/site-functions")));
         t!(fs::create_dir_all(image.join("etc/bash_completion.d")));
         let cargo = builder.ensure(tool::Cargo {
-            compiler: builder.compiler(stage, build.build),
+            compiler: builder.compiler(stage, build.config.build),
             target
         });
         install(&cargo, &image.join("bin"), 0o755);
@@ -1099,7 +1099,7 @@ impl Step for Rls {
         // We expect RLS to build, because we've exited this step above if tool
         // state for RLS isn't testing.
         let rls = builder.ensure(tool::Rls {
-            compiler: builder.compiler(stage, build.build),
+            compiler: builder.compiler(stage, build.config.build),
             target
         }).or_else(|| { println!("Unable to build RLS, skipping dist"); None })?;
 
@@ -1178,11 +1178,11 @@ impl Step for Rustfmt {
 
         // Prepare the image directory
         let rustfmt = builder.ensure(tool::Rustfmt {
-            compiler: builder.compiler(stage, build.build),
+            compiler: builder.compiler(stage, build.config.build),
             target
         }).or_else(|| { println!("Unable to build Rustfmt, skipping dist"); None })?;
         let cargofmt = builder.ensure(tool::Cargofmt {
-            compiler: builder.compiler(stage, build.build),
+            compiler: builder.compiler(stage, build.config.build),
             target
         }).or_else(|| { println!("Unable to build Cargofmt, skipping dist"); None })?;
 
@@ -1241,7 +1241,7 @@ impl Step for Extended {
     fn make_run(run: RunConfig) {
         run.builder.ensure(Extended {
             stage: run.builder.top_stage,
-            host: run.builder.build.build,
+            host: run.builder.build.config.build,
             target: run.host,
         });
     }

diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -240,7 +240,7 @@ impl Step for TheBook {
 
     fn make_run(run: RunConfig) {
         run.builder.ensure(TheBook {
-            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
+            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.config.build),
             target: run.target,
             name: "book",
         });
@@ -339,7 +339,7 @@ impl Step for Standalone {
 
     fn make_run(run: RunConfig) {
         run.builder.ensure(Standalone {
-            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
+            compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.config.build),
             target: run.target,
         });
     }
@@ -450,7 +450,7 @@ impl Step for Std {
         println!("Documenting stage{} std ({})", stage, target);
         let out = build.doc_out(target);
         t!(fs::create_dir_all(&out));
-        let compiler = builder.compiler(stage, build.build);
+        let compiler = builder.compiler(stage, build.config.build);
         let rustdoc = builder.rustdoc(compiler.host);
         let compiler = if build.force_use_stage1(compiler, target) {
             builder.compiler(1, compiler.host)
@@ -535,7 +535,7 @@ impl Step for Test {
         println!("Documenting stage{} test ({})", stage, target);
         let out = build.doc_out(target);
         t!(fs::create_dir_all(&out));
-        let compiler = builder.compiler(stage, build.build);
+        let compiler = builder.compiler(stage, build.config.build);
         let rustdoc = builder.rustdoc(compiler.host);
         let compiler = if build.force_use_stage1(compiler, target) {
             builder.compiler(1, compiler.host)
@@ -596,7 +596,7 @@ impl Step for Rustc {
         println!("Documenting stage{} compiler ({})", stage, target);
         let out = build.doc_out(target);
         t!(fs::create_dir_all(&out));
-        let compiler = builder.compiler(stage, build.build);
+        let compiler = builder.compiler(stage, build.config.build);
         let rustdoc = builder.rustdoc(compiler.host);
         let compiler = if build.force_use_stage1(compiler, target) {
             builder.compiler(1, compiler.host)
@@ -672,7 +672,7 @@ impl Step for ErrorIndex {
         index.arg(out.join("error-index.html"));
 
         // FIXME: shouldn't have to pass this env var
-        index.env("CFG_BUILD", &build.build)
+        index.env("CFG_BUILD", &build.config.build)
              .env("RUSTC_ERROR_METADATA_DST", build.extended_error_dir());
 
         build.run(&mut index);
@@ -705,7 +705,7 @@ impl Step for UnstableBookGen {
         let target = self.target;
 
         builder.ensure(compile::Std {
-            compiler: builder.compiler(builder.top_stage, build.build),
+            compiler: builder.compiler(builder.top_stage, build.config.build),
             target,
         });
 

diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
@@ -173,7 +173,7 @@ macro_rules! install {
                 run.builder.ensure($name {
                     stage: run.builder.top_stage,
                     target: run.target,
-                    host: run.builder.build.build,
+                    host: run.builder.build.config.build,
                 });
             }
 
@@ -226,7 +226,7 @@ install!((self, builder, _config),
         install_analysis(builder, self.stage, self.target);
     };
     Src, "src", Self::should_build(_config) , only_hosts: true, {
-        if self.target == builder.build.build {
+        if self.target == builder.build.config.build {
             builder.ensure(dist::Src);
             install_src(builder, self.stage);
         }

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -226,9 +226,6 @@ pub struct Build {
     doc_tests: bool,
     verbosity: usize,
 
-    // Targets for which to build.
-    build: Interned<String>,
-
     // Probed tools at runtime
     lldb_version: Option<String>,
     lldb_python_dir: Option<String>,
@@ -300,8 +297,6 @@ impl Build {
             doc_tests: config.cmd.doc_tests(),
             verbosity: config.verbose,
 
-            build: config.build,
-
             config,
 
             rust_info,
@@ -322,7 +317,7 @@ impl Build {
 
     pub fn build_triple(&self) -> &[Interned<String>] {
         unsafe {
-            slice::from_raw_parts(&self.build, 1)
+            slice::from_raw_parts(&self.config.build, 1)
         }
     }
 
@@ -714,7 +709,7 @@ impl Build {
     fn force_use_stage1(&self, compiler: Compiler, target: Interned<String>) -> bool {
         !self.config.full_bootstrap &&
             compiler.stage >= 2 &&
-            (self.config.hosts.iter().any(|h| *h == target) || target == self.build)
+            (self.config.hosts.iter().any(|h| *h == target) || target == self.config.build)
     }
 
     /// Returns the directory that OpenSSL artifacts are compiled into if
@@ -944,7 +939,7 @@ impl<'a> Compiler {
 
     /// Returns whether this is a snapshot compiler for `build`'s configuration
     pub fn is_snapshot(&self, build: &Build) -> bool {
-        self.stage == 0 && self.host == build.build
+        self.stage == 0 && self.host == build.config.build
     }
 
     /// Returns if this compiler should be treated as a final stage one in the