bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Re-download LLVM on submodule updates only

Browse source
This commit is contained in:
Mark Rousskov 2020-09-23 19:03:52 -04:00
parent 8b4085359a
commit df004df3a7
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/bootstrap/bootstrap.py
View file

@ -424,8 +424,19 @@ class RustBuild(object):
rustfmt_stamp.write(self.date + self.rustfmt_channel) rustfmt_stamp.write(self.date + self.rustfmt_channel)
if self.downloading_llvm(): if self.downloading_llvm():
llvm_sha = subprocess.check_output(["git", "log", "--author=bors", # We want the most recent LLVM submodule update to avoid downloading
"--format=%H", "-n1"]).decode(sys.getdefaultencoding()).strip() # LLVM more often than necessary.
#
# This git command finds that commit SHA, looking for bors-authored
# merges that modified src/llvm-project.
#
# This works even in a repository that has not yet initialized
# submodules.
llvm_sha = subprocess.check_output([
"git", "log", "--author=bors", "--format=%H", "-n1",
"-m", "--first-parent",
"--", "src/llvm-project"
]).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)):
self._download_ci_llvm(llvm_sha, llvm_assertions) self._download_ci_llvm(llvm_sha, llvm_assertions)