Skip to content

Commit 02087c3

Browse files
bjorn3XAMPPRocky
authored andcommitted
Fix version for cg_clif
1 parent ccfa7e0 commit 02087c3

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

src/bootstrap/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ pub struct Build {
240240
clippy_info: channel::GitInfo,
241241
miri_info: channel::GitInfo,
242242
rustfmt_info: channel::GitInfo,
243-
rustc_codegen_cranelift_info: channel::GitInfo,
244243
in_tree_llvm_info: channel::GitInfo,
245244
local_rebuild: bool,
246245
fail_fast: bool,
@@ -368,8 +367,6 @@ impl Build {
368367
let clippy_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/clippy"));
369368
let miri_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/miri"));
370369
let rustfmt_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/rustfmt"));
371-
let rustc_codegen_cranelift_info =
372-
channel::GitInfo::new(ignore_git, &src.join("compiler/rustc_codegen_cranelift"));
373370

374371
// we always try to use git for LLVM builds
375372
let in_tree_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-project"));
@@ -432,7 +429,6 @@ impl Build {
432429
clippy_info,
433430
miri_info,
434431
rustfmt_info,
435-
rustc_codegen_cranelift_info,
436432
in_tree_llvm_info,
437433
cc: HashMap::new(),
438434
cxx: HashMap::new(),

src/bootstrap/tarball.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ impl OverlayKind {
8989
OverlayKind::RustAnalyzer => builder
9090
.rust_analyzer_info
9191
.version(builder, &builder.release_num("rust-analyzer/crates/rust-analyzer")),
92-
OverlayKind::RustcCodegenCranelift => builder
93-
.rustc_codegen_cranelift_info
94-
.version(builder, &builder.release_num("rustc_codegen_cranelift")),
92+
OverlayKind::RustcCodegenCranelift => builder.rust_version(),
9593
}
9694
}
9795
}

0 commit comments

Comments
 (0)