mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #86568 - ehuss:dist-miri-stable, r=Mark-Simulacrum

Browse Source 
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 #86286
This commit is contained in:
Yuki Okushi 2021-06-29 00:26:57 +09:00 committed by GitHub
commit daa3ceb22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bootstrap/dist.rs
View File

@ -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,12 @@ 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;
}
let compiler = self.compiler;
let target = self.target;
assert!(builder.config.extended);