Skip to content

Commit 04ffaca

Browse files
authored
Rollup merge of #59544 - cuviper:miri-nightly, r=Centril
manifest: only include miri on the nightly channel miri needs to build std with xargo, which doesn't allow stable/beta: <japaric/xargo#204 (comment)> Therefore, at this time there's no point in making miri available on any but the nightly channel. If we get a stable way to build `std`, like [RFC 2663], then we can re-evaluate whether to start including miri, perhaps still as `miri-preview`. [RFC 2663]: rust-lang/rfcs#2663
2 parents 68d03c0 + b222b6f commit 04ffaca

File tree

1 file changed

+7
-1
lines changed
  • src/tools/build-manifest/src

1 file changed

+7
-1
lines changed

src/tools/build-manifest/src/main.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -523,12 +523,18 @@ impl Builder {
523523
pkgname: &str,
524524
dst: &mut BTreeMap<String, Package>,
525525
targets: &[&str]) {
526-
let (version, is_present) = self.cached_version(pkgname)
526+
let (version, mut is_present) = self.cached_version(pkgname)
527527
.as_ref()
528528
.cloned()
529529
.map(|version| (version, true))
530530
.unwrap_or_default();
531531

532+
// miri needs to build std with xargo, which doesn't allow stable/beta:
533+
// <https://github.com/japaric/xargo/pull/204#issuecomment-374888868>
534+
if pkgname == "miri-preview" && self.rust_release != "nightly" {
535+
is_present = false; // ignore it
536+
}
537+
532538
let targets = targets.iter().map(|name| {
533539
if is_present {
534540
let filename = self.filename(pkgname, name);

0 commit comments

Comments
 (0)