Skip to content

Commit

Permalink
Rollup merge of rust-lang#124071 - kjetilkjeka:llvm_bitcode_linker_bu…
Browse files Browse the repository at this point in the history
…ild_manifest, r=Mark-Simulacrum

Add llvm-bitcode-linker to build manifest

When creating rust-lang#123423 I didn't realize I also had to add the new component to the build-manifest. This PR finishes the work of adding it, by also adding it to the build manifest.

r? ``@Mark-Simulacrum``
  • Loading branch information
jieyouxu authored Apr 20, 2024
2 parents f13cd0c + 4734163 commit 29ee276
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ impl Builder {
| PkgType::LlvmTools
| PkgType::RustAnalysis
| PkgType::JsonDocs
| PkgType::RustcCodegenCranelift => {
| PkgType::RustcCodegenCranelift
| PkgType::LlvmBitcodeLinker => {
extensions.push(host_component(pkg));
}
PkgType::RustcDev | PkgType::RustcDocs => {
Expand Down
3 changes: 3 additions & 0 deletions src/tools/build-manifest/src/versions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ pkg_type! {
Miri = "miri"; preview = true,
JsonDocs = "rust-docs-json"; preview = true,
RustcCodegenCranelift = "rustc-codegen-cranelift"; preview = true,
LlvmBitcodeLinker = "llvm-bitcode-linker"; preview = true,
}

impl PkgType {
Expand Down Expand Up @@ -94,6 +95,7 @@ impl PkgType {
PkgType::ReproducibleArtifacts => true,
PkgType::RustMingw => true,
PkgType::RustAnalysis => true,
PkgType::LlvmBitcodeLinker => true,
}
}

Expand Down Expand Up @@ -121,6 +123,7 @@ impl PkgType {
Rustfmt => HOSTS,
RustAnalysis => TARGETS,
LlvmTools => TARGETS,
LlvmBitcodeLinker => HOSTS,
}
}

Expand Down

0 comments on commit 29ee276

Please sign in to comment.