bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "avoid compiler_for for dist tools and force the current compiler"

Browse source 
This reverts commit 50f84129e6.
This commit is contained in:
onur-ozkan 2025-03-05 09:26:58 +03:00
parent 9e4b3d6bc4
commit 0acc0c874b
2 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -421,7 +421,11 @@ impl Step for Rustc {
if let Some(ra_proc_macro_srv) = builder.ensure_if_default( if let Some(ra_proc_macro_srv) = builder.ensure_if_default(
tool::RustAnalyzerProcMacroSrv { tool::RustAnalyzerProcMacroSrv {
compiler: builder.compiler(compiler.stage, builder.config.build), compiler: builder.compiler_for(
compiler.stage,
builder.config.build,
compiler.host,
),
target: compiler.host, target: compiler.host,
}, },
builder.kind, builder.kind,
@ -771,7 +775,11 @@ impl Step for Analysis {
// Find the actual compiler (handling the full bootstrap option) which // Find the actual compiler (handling the full bootstrap option) which
// produced the save-analysis data because that data isn't copied // produced the save-analysis data because that data isn't copied
// through the sysroot uplifting. // through the sysroot uplifting.
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1116,7 +1124,11 @@ impl Step for Cargo {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Cargo { run.builder.ensure(Cargo {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1161,7 +1173,11 @@ impl Step for Rls {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Rls { run.builder.ensure(Rls {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1199,7 +1215,11 @@ impl Step for RustAnalyzer {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(RustAnalyzer { run.builder.ensure(RustAnalyzer {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1237,7 +1257,11 @@ impl Step for Clippy {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Clippy { run.builder.ensure(Clippy {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1280,7 +1304,11 @@ impl Step for Miri {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Miri { run.builder.ensure(Miri {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1414,7 +1442,11 @@ impl Step for Rustfmt {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Rustfmt { run.builder.ensure(Rustfmt {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }
@ -1464,7 +1496,7 @@ impl Step for Extended {
fn run(self, builder: &Builder<'_>) { fn run(self, builder: &Builder<'_>) {
let target = self.target; let target = self.target;
let stage = self.stage; let stage = self.stage;
let compiler = builder.compiler(self.stage, self.host); let compiler = builder.compiler_for(self.stage, self.host, self.target);
builder.info(&format!("Dist extended stage{} ({})", compiler.stage, target)); builder.info(&format!("Dist extended stage{} ({})", compiler.stage, target));
@ -2227,7 +2259,11 @@ impl Step for LlvmBitcodeLinker {
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
run.builder.ensure(LlvmBitcodeLinker { run.builder.ensure(LlvmBitcodeLinker {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), compiler: run.builder.compiler_for(
run.builder.top_stage,
run.builder.config.build,
run.target,
),
target: run.target, target: run.target,
}); });
} }

2
src/bootstrap/src/core/builder/tests.rs
View file

@ -525,7 +525,7 @@ mod dist {
first(cache.all::<compile::Rustc>()), first(cache.all::<compile::Rustc>()),
&[ &[
rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_1, stage = 0), 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 = 0),
rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1), rustc!(TEST_TRIPLE_1 => TEST_TRIPLE_2, stage = 1),
] ]
); );