Skip to content

Commit 15a102b

Browse files
Always permit miri to fail to build
This presumably "accidentally" never actually got triggered in the past, but since we don't actually require shipping miri on beta or stable, this should be fine.
1 parent 8984aaf commit 15a102b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/bootstrap/dist.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1461,18 +1461,18 @@ impl Step for Miri {
14611461
builder.create_dir(&image);
14621462

14631463
// Prepare the image directory
1464-
// We expect miri to build, because we've exited this step above if tool
1465-
// state for miri isn't testing.
1464+
// We're always fine with miri not building, we don't ship it on
1465+
// beta/stable anyway.
14661466
let miri = builder
14671467
.ensure(tool::Miri { compiler, target, extra_features: Vec::new() })
14681468
.or_else(|| {
1469-
missing_tool("miri", builder.build.config.missing_tools);
1469+
missing_tool("miri", true);
14701470
None
14711471
})?;
14721472
let cargomiri = builder
14731473
.ensure(tool::CargoMiri { compiler, target, extra_features: Vec::new() })
14741474
.or_else(|| {
1475-
missing_tool("cargo miri", builder.build.config.missing_tools);
1475+
missing_tool("cargo miri", true);
14761476
None
14771477
})?;
14781478

0 commit comments

Comments
 (0)