From 754d46e33a2a01fef9732b4bb7c2bb479f744195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
Date: Tue, 10 Jun 2025 20:15:36 +0200
Subject: [PATCH] Remove `extra_features` from `LlvmBitcodeLinker`

It wasn't used anywhere.
---
 src/bootstrap/src/core/build_steps/compile.rs | 1 -
 src/bootstrap/src/core/build_steps/dist.rs    | 3 +--
 src/bootstrap/src/core/build_steps/tool.rs    | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 3e2bdc2d6b5a..c84f451bbb2a 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -2061,7 +2061,6 @@ impl Step for Assemble {
                     builder.ensure(crate::core::build_steps::tool::LlvmBitcodeLinker {
                         compiler,
                         target: target_compiler.host,
-                        extra_features: vec![],
                     });
                 let tool_exe = exe("llvm-bitcode-linker", target_compiler.host);
                 builder.copy_link(
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 25b7e5a1b5d1..f2aace768964 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -2374,8 +2374,7 @@ impl Step for LlvmBitcodeLinker {
 
         builder.ensure(compile::Rustc::new(compiler, target));
 
-        let llbc_linker =
-            builder.ensure(tool::LlvmBitcodeLinker { compiler, target, extra_features: vec![] });
+        let llbc_linker = builder.ensure(tool::LlvmBitcodeLinker { compiler, target });
 
         let self_contained_bin_dir = format!("lib/rustlib/{}/bin/self-contained", target.triple);
 
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index b05b34b9b228..b906409aedd8 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -1016,7 +1016,6 @@ impl Step for RustAnalyzerProcMacroSrv {
 pub struct LlvmBitcodeLinker {
     pub compiler: Compiler,
     pub target: TargetSelection,
-    pub extra_features: Vec<String>,
 }
 
 impl Step for LlvmBitcodeLinker {
@@ -1033,7 +1032,6 @@ impl Step for LlvmBitcodeLinker {
     fn make_run(run: RunConfig<'_>) {
         run.builder.ensure(LlvmBitcodeLinker {
             compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.host_target),
-            extra_features: Vec::new(),
             target: run.target,
         });
     }
@@ -1050,7 +1048,7 @@ impl Step for LlvmBitcodeLinker {
             mode: Mode::ToolRustc,
             path: "src/tools/llvm-bitcode-linker",
             source_type: SourceType::InTree,
-            extra_features: self.extra_features,
+            extra_features: vec![],
             allow_features: "",
             cargo_args: Vec::new(),
             artifact_kind: ToolArtifactKind::Binary,