about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2021-06-23 07:03:42 -0700
committerEric Huss <eric@huss.org>2021-06-23 07:05:28 -0700
commit6aa79a34d87252deaae11e75663e5740a22f14ea (patch)
tree998bb1c18eb9e7d96ad8215318e1abf29fee28a2
parent601d24810e89efd42f7cd69d4a7ccecd4e35364d (diff)
downloadrust-6aa79a34d87252deaae11e75663e5740a22f14ea.tar.gz
rust-6aa79a34d87252deaae11e75663e5740a22f14ea.zip
Comment and include rust-analyzer.
-rw-r--r--src/bootstrap/dist.rs9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index e0c33f73577..19895baf08f 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1072,6 +1072,12 @@ impl Step for RustAnalyzer {
     }
 
     fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+        // This prevents rust-analyzer from being built for "dist" or "install"
+        // on the stable/beta channels. It is a nightly-only tool and should
+        // not be included.
+        if !builder.build.unstable_features() {
+            return None;
+        }
         let compiler = self.compiler;
         let target = self.target;
         assert!(builder.config.extended);
@@ -1171,6 +1177,9 @@ impl Step for Miri {
     }
 
     fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+        // This prevents miri from being built for "dist" or "install"
+        // on the stable/beta channels. It is a nightly-only tool and should
+        // not be included.
         if !builder.build.unstable_features() {
             return None;
         }