Skip to content

Commit

Permalink
Only allow compiletest to use feature(test), not any other feature
Browse files Browse the repository at this point in the history
Using language features occasionally causes issues when using nightly to bootstrap, rather than beta.
See rust-lang#59264 for additional context.
  • Loading branch information
jyn514 committed May 25, 2022
1 parent 1b5e121 commit e71c48c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,12 @@ impl<'a> Builder<'a> {
// HACK: because anyhow does feature detection in build.rs, we need to allow the backtrace feature too.
rustflags.arg("-Zallow-features=binary-dep-depinfo,backtrace");
}
Mode::Std | Mode::Rustc | Mode::ToolStd | Mode::Codegen | Mode::ToolRustc => {}
Mode::ToolStd => {
// Right now this is just compiletest and a few other tools that build on stable.
// Allow them to use `feature(test)`, but nothing else.
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace");
}
Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
}

cargo.arg("-j").arg(self.jobs().to_string());
Expand Down

0 comments on commit e71c48c

Please sign in to comment.