about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2025-04-04 20:40:57 +0300
committeronur-ozkan <work@onurozkan.dev>2025-04-05 14:22:11 +0300
commit17fad21702c8d20dd7c84dd8e6122dc777059d76 (patch)
tree41f055327a64fc5ac875059fbb08810810090c8d
parent86a7ee603cd438679f9aa7d2094352ebe3838ef5 (diff)
downloadrust-17fad21702c8d20dd7c84dd8e6122dc777059d76.tar.gz
rust-17fad21702c8d20dd7c84dd8e6122dc777059d76.zip
utilize `compiletest_use_stage0_libtest` option
Signed-off-by: onur-ozkan <work@onurozkan.dev>
-rw-r--r--src/bootstrap/src/core/build_steps/tool.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index cd57e06ae04..b58d279359e 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -425,11 +425,14 @@ macro_rules! bootstrap_tool {
                     }
                 )*
 
+                let is_unstable = false $(|| $unstable)*;
+                let compiletest_wants_stage0 = $tool_name == "compiletest" && builder.config.compiletest_use_stage0_libtest;
+
                 builder.ensure(ToolBuild {
                     compiler: self.compiler,
                     target: self.target,
                     tool: $tool_name,
-                    mode: if false $(|| $unstable)* {
+                    mode: if is_unstable && !compiletest_wants_stage0 {
                         // use in-tree libraries for unstable features
                         Mode::ToolStd
                     } else {