diff options
| author | bors <bors@rust-lang.org> | 2021-03-22 04:03:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-22 04:03:53 +0000 |
| commit | 142c831861ba5a995fd9de99198e7f6074b6b400 (patch) | |
| tree | 3a43c288d544f23fb39cc4f42834bea8170ebc0e /src/bootstrap | |
| parent | 35385770ae1ea86a911cc44ac43f856831e44b26 (diff) | |
| parent | 790c2ad46ac5d29903d75125679b7604dcc206fe (diff) | |
| download | rust-142c831861ba5a995fd9de99198e7f6074b6b400.tar.gz rust-142c831861ba5a995fd9de99198e7f6074b6b400.zip | |
Auto merge of #83360 - Dylan-DPC:rollup-17xulpv, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #80193 (stabilize `feature(osstring_ascii)`) - #80771 (Make NonNull::as_ref (and friends) return refs with unbound lifetimes) - #81607 (Implement TrustedLen and TrustedRandomAccess for Range<integer>, array::IntoIter, VecDequeue's iterators) - #82554 (Fix invalid slice access in String::retain) - #82686 (Move `std::sys::unix::platform` to `std::sys::unix::ext`) - #82771 (slice: Stabilize IterMut::as_slice.) - #83329 (Cleanup LLVM debuginfo module docs) - #83336 (Fix ICE with `use clippy::a::b;`) - #83350 (Download a more recent LLVM version if `src/version` is modified) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 3e7d1d54f12..075756b73ba 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -463,6 +463,8 @@ class RustBuild(object): "--", "{}/src/llvm-project".format(top_level), "{}/src/bootstrap/download-ci-llvm-stamp".format(top_level), + # the LLVM shared object file is named `LLVM-12-rust-{version}-nightly` + "{}/src/version".format(top_level) ]).decode(sys.getdefaultencoding()).strip() llvm_assertions = self.get_toml('assertions', 'llvm') == 'true' llvm_root = self.llvm_root() |