Skip to content

Commit 669e3cd

Browse files
author
Yuki Okushi
authored
Rollup merge of #103805 - Mark-Simulacrum:forward-port, r=jyn514
Enable RUSTC_BOOTSTRAP for a few steps This forward-ports this commit so we don't need to keep applying it when branching beta (as done in 1.64, 1.65, and 1.66 beta bumps).
2 parents fca9093 + b123a66 commit 669e3cd

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Diff for: src/bootstrap/test.rs

+3
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ impl Step for RustdocGUI {
986986
.arg("doc")
987987
.arg("--target-dir")
988988
.arg(&out_dir)
989+
.env("RUSTC_BOOTSTRAP", "1")
989990
.env("RUSTDOC", builder.rustdoc(self.compiler))
990991
.env("RUSTC", builder.rustc(self.compiler))
991992
.current_dir(path);
@@ -1725,6 +1726,8 @@ impl BookTest {
17251726

17261727
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
17271728
let path = builder.src.join(&self.path);
1729+
// Books often have feature-gated example text.
1730+
rustbook_cmd.env("RUSTC_BOOTSTRAP", "1");
17281731
rustbook_cmd.env("PATH", new_path).arg("test").arg(path);
17291732
builder.add_rust_test_threads(&mut rustbook_cmd);
17301733
builder.info(&format!("Testing rustbook {}", self.path.display()));

0 commit comments

Comments
 (0)