about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2025-05-10 19:25:46 +0300
committeronur-ozkan <work@onurozkan.dev>2025-05-23 18:58:34 +0300
commit55298ea6ea61f337ac563381582b66d3aa9c0b7f (patch)
treea01c27193d66db57651454478725b0228ad53c91
parent163cb4ea3f0ae3bc7921cc259a08a7bf92e73ee6 (diff)
downloadrust-55298ea6ea61f337ac563381582b66d3aa9c0b7f.tar.gz
rust-55298ea6ea61f337ac563381582b66d3aa9c0b7f.zip
if stage isn't set explicitly, default to 1 when running miri
Signed-off-by: onur-ozkan <work@onurozkan.dev>
-rw-r--r--src/bootstrap/src/core/build_steps/run.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/run.rs b/src/bootstrap/src/core/build_steps/run.rs
index 0bba441c3fa..f6eb1f6fd90 100644
--- a/src/bootstrap/src/core/build_steps/run.rs
+++ b/src/bootstrap/src/core/build_steps/run.rs
@@ -118,7 +118,15 @@ impl Step for Miri {
     fn run(self, builder: &Builder<'_>) {
         let host = builder.build.build;
         let target = self.target;
-        let stage = builder.top_stage;
+
+        // `x run` uses stage 0 by default but miri does not work well with stage 0.
+        // Change the stage to 1 if it's not set explicitly.
+        let stage = if builder.config.is_explicit_stage() || builder.top_stage >= 1 {
+            builder.top_stage
+        } else {
+            1
+        };
+
         if stage == 0 {
             eprintln!("miri cannot be run at stage 0");
             std::process::exit(1);