From ef028d79d6d4d54576c88dbd1f9de7f4824c0289 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Sun, 2 Mar 2025 08:27:40 +0000
Subject: [PATCH 1/2] do not build additional stage on compiler paths
When calling `x build compiler (or rustc) --stage N` bootstrap builds stage N+1 compiler,
which is clearly not what we requested. This doesn't happen when running `x build --stage N`
without explicitly targeting the compiler.
The changes applied fix this issue.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/build_steps/compile.rs | 6 ++++--
src/bootstrap/src/core/builder/tests.rs | 4 +---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 9d3d07c83d25a..163b59b10dee5 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -993,7 +993,9 @@ impl Step for Rustc {
fn make_run(run: RunConfig<'_>) {
let crates = run.cargo_crates_in_set();
run.builder.ensure(Rustc {
- compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
+ compiler: run
+ .builder
+ .compiler(run.builder.top_stage.saturating_sub(1), run.build_triple()),
target: run.target,
crates,
});
@@ -1902,7 +1904,7 @@ impl Step for Assemble {
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Assemble {
- target_compiler: run.builder.compiler(run.builder.top_stage + 1, run.target),
+ target_compiler: run.builder.compiler(run.builder.top_stage, run.target),
});
}
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 0eaa89792bd97..9adc27645f1f2 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -664,15 +664,13 @@ mod dist {
std!(TEST_TRIPLE_1 => TEST_TRIPLE_3, stage = 2),
]
);
- assert_eq!(builder.cache.all::<compile::Assemble>().len(), 5);
+ assert_eq!(builder.cache.all::<compile::Assemble>().len(), 4);
assert_eq!(
first(builder.cache.all::<compile::Rustc>()),
&[
rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0),
rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 1),
- rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 2),
rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1),
- rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 2),
]
);
}
From cfb475c1d2ca0bf2c717c3750cb01c7435f01d71 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Sun, 2 Mar 2025 09:22:35 +0000
Subject: [PATCH 2/2] extend scope of build_all test
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/builder/tests.rs | 45 ++++++++++++++++++++++---
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 9adc27645f1f2..1f27002f81caa 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -653,6 +653,20 @@ mod dist {
&["compiler/rustc".into(), "library".into()],
);
+ assert_eq!(builder.config.stage, 2);
+
+ // `compile::Rustc` includes one-stage-off compiler information as the target compiler
+ // artifacts get copied from there to the target stage sysroot.
+ // For example, `stage2/bin/rustc` gets copied from the `stage1-rustc` build directory.
+ assert_eq!(
+ first(builder.cache.all::<compile::Rustc>()),
+ &[
+ rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0),
+ rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 1),
+ rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1),
+ ]
+ );
+
assert_eq!(
first(builder.cache.all::<compile::Std>()),
&[
@@ -664,13 +678,34 @@ mod dist {
std!(TEST_TRIPLE_1 => TEST_TRIPLE_3, stage = 2),
]
);
- assert_eq!(builder.cache.all::<compile::Assemble>().len(), 4);
+
assert_eq!(
- first(builder.cache.all::<compile::Rustc>()),
+ first(builder.cache.all::<compile::Assemble>()),
&[
- rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0),
- rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 1),
- rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1),
+ compile::Assemble {
+ target_compiler: Compiler {
+ host: TargetSelection::from_user(TEST_TRIPLE_1),
+ stage: 0
+ }
+ },
+ compile::Assemble {
+ target_compiler: Compiler {
+ host: TargetSelection::from_user(TEST_TRIPLE_1),
+ stage: 1
+ }
+ },
+ compile::Assemble {
+ target_compiler: Compiler {
+ host: TargetSelection::from_user(TEST_TRIPLE_1),
+ stage: 2
+ }
+ },
+ compile::Assemble {
+ target_compiler: Compiler {
+ host: TargetSelection::from_user(TEST_TRIPLE_2),
+ stage: 2
+ }
+ },
]
);
}