Move NoLlvmMetadataLoader to rustc_trans_traits

2 files changed, 3 insertions, 4 deletions

diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 2768d9c7f04..848b10d312c 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -159,10 +159,6 @@ fn main() {
             cmd.arg("-C").arg("panic=abort");
         }
 
-        if env::var("RUSTC_LLVM_ENABLED") == Ok("0".to_string()) && stage != "0" {
-            cmd.arg("-Zno-trans");
-        }
-
         // Set various options from config.toml to configure how we're building
         // code.
         if env::var("RUSTC_DEBUGINFO") == Ok("true".to_string()) {
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 99712d9fcab..8307a536c33 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -531,6 +531,9 @@ impl<'a> Builder<'a> {
         // For other crates, however, we know that we've already got a standard
         // library up and running, so we can use the normal compiler to compile
         // build scripts in that situation.
+        //
+        // If LLVM support is disabled we need to use the snapshot compiler to compile
+        // build scripts, as the new compiler doesnt support executables.
         if mode == Mode::Libstd || !self.build.config.llvm_enabled {
             cargo.env("RUSTC_SNAPSHOT", &self.initial_rustc)
                  .env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());