Skip to content

Commit 9ed5fba

Browse files
committed
Remove extra_features from LlvmBitcodeLinker
It wasn't used anywhere.
1 parent 1c04750 commit 9ed5fba

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
@@ -2031,7 +2031,6 @@ impl Step for Assemble {
20312031
builder.ensure(crate::core::build_steps::tool::LlvmBitcodeLinker {
20322032
compiler,
20332033
target: target_compiler.host,
2034-
extra_features: vec![],
20352034
});
20362035
let tool_exe = exe("llvm-bitcode-linker", target_compiler.host);
20372036
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
@@ -2354,8 +2354,7 @@ impl Step for LlvmBitcodeLinker {
23542354

23552355
builder.ensure(compile::Rustc::new(compiler, target));
23562356

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

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

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,6 @@ impl Step for RustAnalyzerProcMacroSrv {
987987
pub struct LlvmBitcodeLinker {
988988
pub compiler: Compiler,
989989
pub target: TargetSelection,
990-
pub extra_features: Vec<String>,
991990
}
992991

993992
impl Step for LlvmBitcodeLinker {
@@ -1004,7 +1003,6 @@ impl Step for LlvmBitcodeLinker {
10041003
fn make_run(run: RunConfig<'_>) {
10051004
run.builder.ensure(LlvmBitcodeLinker {
10061005
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
1007-
extra_features: Vec::new(),
10081006
target: run.target,
10091007
});
10101008
}
@@ -1021,7 +1019,7 @@ impl Step for LlvmBitcodeLinker {
10211019
mode: Mode::ToolRustc,
10221020
path: "src/tools/llvm-bitcode-linker",
10231021
source_type: SourceType::InTree,
1024-
extra_features: self.extra_features,
1022+
extra_features: vec![],
10251023
allow_features: "",
10261024
cargo_args: Vec::new(),
10271025
artifact_kind: ToolArtifactKind::Binary,

0 commit comments

Comments
 (0)