Skip to content

Commit daa3ceb

Browse files
authored
Rollup merge of rust-lang#86568 - ehuss:dist-miri-stable, r=Mark-Simulacrum
Don't dist miri or rust-analyzer on stable or beta. This prevents miri and 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. Closes rust-lang#86286
2 parents de93434 + 6aa79a3 commit daa3ceb

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

src/bootstrap/dist.rs

+12
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,12 @@ impl Step for RustAnalyzer {
10721072
}
10731073

10741074
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
1075+
// This prevents rust-analyzer from being built for "dist" or "install"
1076+
// on the stable/beta channels. It is a nightly-only tool and should
1077+
// not be included.
1078+
if !builder.build.unstable_features() {
1079+
return None;
1080+
}
10751081
let compiler = self.compiler;
10761082
let target = self.target;
10771083
assert!(builder.config.extended);
@@ -1171,6 +1177,12 @@ impl Step for Miri {
11711177
}
11721178

11731179
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
1180+
// This prevents miri from being built for "dist" or "install"
1181+
// on the stable/beta channels. It is a nightly-only tool and should
1182+
// not be included.
1183+
if !builder.build.unstable_features() {
1184+
return None;
1185+
}
11741186
let compiler = self.compiler;
11751187
let target = self.target;
11761188
assert!(builder.config.extended);

0 commit comments

Comments
 (0)