]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #86015 - jyn514:revert-revert, r=Mark-Simulacrum
authorbors <bors@rust-lang.org>
Fri, 25 Jun 2021 23:47:56 +0000 (23:47 +0000)
committerbors <bors@rust-lang.org>
Fri, 25 Jun 2021 23:47:56 +0000 (23:47 +0000)
Move LLVM submodule updates back to native.rs

Time to find more bugs!

The first commit is a straight revert of https://github.com/rust-lang/rust/pull/85647, the second is a fix for https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/x.2Epy.20always.20updates.20LLVM.20submodule/near/240113320 and https://github.com/rust-lang/rust/pull/82653#issuecomment-846755631. I haven't been able to replicate https://github.com/rust-lang/rust/pull/82653#issuecomment-849013698.

1  2 
src/bootstrap/bootstrap.py
src/bootstrap/lib.rs
src/bootstrap/native.rs

Simple merge
Simple merge
Simple merge