Skip to content

Commit 754d46e

Browse files
committed
Remove extra_features from LlvmBitcodeLinker
It wasn't used anywhere.
1 parent 2783fc4 commit 754d46e

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,6 @@ impl Step for Assemble {
20612061
builder.ensure(crate::core::build_steps::tool::LlvmBitcodeLinker {
20622062
compiler,
20632063
target: target_compiler.host,
2064-
extra_features: vec![],
20652064
});
20662065
let tool_exe = exe("llvm-bitcode-linker", target_compiler.host);
20672066
builder.copy_link(

src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,8 +2374,7 @@ impl Step for LlvmBitcodeLinker {
23742374

23752375
builder.ensure(compile::Rustc::new(compiler, target));
23762376

2377-
let llbc_linker =
2378-
builder.ensure(tool::LlvmBitcodeLinker { compiler, target, extra_features: vec![] });
2377+
let llbc_linker = builder.ensure(tool::LlvmBitcodeLinker { compiler, target });
23792378

23802379
let self_contained_bin_dir = format!("lib/rustlib/{}/bin/self-contained", target.triple);
23812380

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,6 @@ impl Step for RustAnalyzerProcMacroSrv {
10161016
pub struct LlvmBitcodeLinker {
10171017
pub compiler: Compiler,
10181018
pub target: TargetSelection,
1019-
pub extra_features: Vec<String>,
10201019
}
10211020

10221021
impl Step for LlvmBitcodeLinker {
@@ -1033,7 +1032,6 @@ impl Step for LlvmBitcodeLinker {
10331032
fn make_run(run: RunConfig<'_>) {
10341033
run.builder.ensure(LlvmBitcodeLinker {
10351034
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.host_target),
1036-
extra_features: Vec::new(),
10371035
target: run.target,
10381036
});
10391037
}
@@ -1050,7 +1048,7 @@ impl Step for LlvmBitcodeLinker {
10501048
mode: Mode::ToolRustc,
10511049
path: "src/tools/llvm-bitcode-linker",
10521050
source_type: SourceType::InTree,
1053-
extra_features: self.extra_features,
1051+
extra_features: vec![],
10541052
allow_features: "",
10551053
cargo_args: Vec::new(),
10561054
artifact_kind: ToolArtifactKind::Binary,

0 commit comments

Comments
 (0)