diff options
| author | bors <bors@rust-lang.org> | 2021-12-06 00:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-06 00:46:14 +0000 |
| commit | 09d8a50ea26df391b58373e22f5891740efdd6cc (patch) | |
| tree | 5d322dc8222d8d595114e0b8a5019b0503c437b1 /src/bootstrap | |
| parent | e2116acae59654bfab2a9729a024f3e2fd6d4b02 (diff) | |
| parent | d056cbf8d6648ce6c94b97586df3bed8b66854ed (diff) | |
| download | rust-09d8a50ea26df391b58373e22f5891740efdd6cc.tar.gz rust-09d8a50ea26df391b58373e22f5891740efdd6cc.zip | |
Auto merge of #91573 - matthiaskrgr:rollup-wcygm2r, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #91367 (Fix ICE in `check_must_not_suspend_ty()`) - #91391 (Simplify --no-headless option for rustdoc-gui tester) - #91537 (compiler/rustc_target: make m68k-unknown-linux-gnu use the gnu base) - #91554 (Update doc about code block edition attributes) - #91563 (Bump download-ci-llvm-stamp for LLD inclusion) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/download-ci-llvm-stamp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp index 19e5fffcc2d..ef635ee26df 100644 --- a/src/bootstrap/download-ci-llvm-stamp +++ b/src/bootstrap/download-ci-llvm-stamp @@ -1,4 +1,4 @@ Change this file to make users of the `download-ci-llvm` configuration download a new version of LLVM from CI, even if the LLVM submodule hasn’t changed. -Last change is for: https://github.com/rust-lang/rust/pull/88069 +Last change is for: https://github.com/rust-lang/rust/pull/91229 |