about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-09-17 20:42:21 +0300
committeronur-ozkan <work@onurozkan.dev>2024-09-18 07:03:00 +0300
commitc592eacc63220df01fb08228fc5bc78b75dc1dd1 (patch)
tree77ef7d9df4d7d4b4225e2e2359cf08c4691a9449 /src/bootstrap
parent60c3673456cb5eba4d6ac4ed22be179deebb6dcf (diff)
downloadrust-c592eacc63220df01fb08228fc5bc78b75dc1dd1.tar.gz
rust-c592eacc63220df01fb08228fc5bc78b75dc1dd1.zip
skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/build_steps/tool.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index a437f829ba5..6c3bb694f92 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -872,8 +872,11 @@ impl Step for LlvmBitcodeLinker {
     fn run(self, builder: &Builder<'_>) -> PathBuf {
         let bin_name = "llvm-bitcode-linker";
 
-        builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
-        builder.ensure(compile::Rustc::new(self.compiler, self.target));
+        // If enabled, use ci-rustc and skip building the in-tree compiler.
+        if !builder.download_rustc() {
+            builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
+            builder.ensure(compile::Rustc::new(self.compiler, self.target));
+        }
 
         let cargo = prepare_tool_cargo(
             builder,