diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-02-20 16:38:18 +0100 |
|---|---|---|
| committer | Erin Power <erin.power@embark-studios.com> | 2021-04-30 15:37:42 +0200 |
| commit | 02087c34c4f132dd93d1a534589391f491cc9d91 (patch) | |
| tree | 50fbabf413ccfdd081c129f7da2a91be2f99d6e3 | |
| parent | ccfa7e05cccf528dfac799d6c02ee0ed7e5a9531 (diff) | |
| download | rust-02087c34c4f132dd93d1a534589391f491cc9d91.tar.gz | |
Fix version for cg_clif
| -rw-r--r-- | src/bootstrap/lib.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/tarball.rs | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 1261fc2a69b..24da44b933a 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -240,7 +240,6 @@ pub struct Build { clippy_info: channel::GitInfo, miri_info: channel::GitInfo, rustfmt_info: channel::GitInfo, - rustc_codegen_cranelift_info: channel::GitInfo, in_tree_llvm_info: channel::GitInfo, local_rebuild: bool, fail_fast: bool, @@ -368,8 +367,6 @@ impl Build { let clippy_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/clippy")); let miri_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/miri")); let rustfmt_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/rustfmt")); - let rustc_codegen_cranelift_info = - channel::GitInfo::new(ignore_git, &src.join("compiler/rustc_codegen_cranelift")); // we always try to use git for LLVM builds let in_tree_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-project")); @@ -432,7 +429,6 @@ impl Build { clippy_info, miri_info, rustfmt_info, - rustc_codegen_cranelift_info, in_tree_llvm_info, cc: HashMap::new(), cxx: HashMap::new(), diff --git a/src/bootstrap/tarball.rs b/src/bootstrap/tarball.rs index 3578379383b..f70c8537375 100644 --- a/src/bootstrap/tarball.rs +++ b/src/bootstrap/tarball.rs @@ -89,9 +89,7 @@ impl OverlayKind { OverlayKind::RustAnalyzer => builder .rust_analyzer_info .version(builder, &builder.release_num("rust-analyzer/crates/rust-analyzer")), - OverlayKind::RustcCodegenCranelift => builder - .rustc_codegen_cranelift_info - .version(builder, &builder.release_num("rustc_codegen_cranelift")), + OverlayKind::RustcCodegenCranelift => builder.rust_version(), } } } |