Skip to content

Commit

Permalink
Rollup merge of #59544 - cuviper:miri-nightly, r=Centril
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Centril authored Mar 30, 2019
2 parents 68d03c0 + b222b6f commit 04ffaca
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,18 @@ impl Builder {
pkgname: &str,
dst: &mut BTreeMap<String, Package>,
targets: &[&str]) {
let (version, is_present) = self.cached_version(pkgname)
let (version, mut is_present) = self.cached_version(pkgname)
.as_ref()
.cloned()
.map(|version| (version, true))
.unwrap_or_default();

// miri needs to build std with xargo, which doesn't allow stable/beta:
// <https://github.com/japaric/xargo/pull/204#issuecomment-374888868>
if pkgname == "miri-preview" && self.rust_release != "nightly" {
is_present = false; // ignore it
}

let targets = targets.iter().map(|name| {
if is_present {
let filename = self.filename(pkgname, name);
Expand Down

0 comments on commit 04ffaca

Please sign in to comment.