bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make users of download-ci-llvm download a new version

Browse source
This commit is contained in:
Simon Sapin 2020-10-20 20:04:53 +02:00
parent bc3dbc62d6
commit 99f99ca7ab
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/bootstrap.py
View file

@ -435,7 +435,9 @@ class RustBuild(object):
llvm_sha = subprocess.check_output([ llvm_sha = subprocess.check_output([
"git", "log", "--author=bors", "--format=%H", "-n1", "git", "log", "--author=bors", "--format=%H", "-n1",
"-m", "--first-parent", "-m", "--first-parent",
"--", "src/llvm-project" "--",
"src/llvm-project",
"src/bootstrap/download-ci-llvm-stamp",
]).decode(sys.getdefaultencoding()).strip() ]).decode(sys.getdefaultencoding()).strip()
llvm_assertions = self.get_toml('assertions', 'llvm') == 'true' llvm_assertions = self.get_toml('assertions', 'llvm') == 'true'
if self.program_out_of_date(self.llvm_stamp(), llvm_sha + str(llvm_assertions)): if self.program_out_of_date(self.llvm_stamp(), llvm_sha + str(llvm_assertions)):

4
src/bootstrap/download-ci-llvm-stamp Normal file
View file

@ -0,0 +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/78131