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

rust-lang · Oct 20, 2020 · 99f99ca · 99f99ca
1 parent bc3dbc6
commit 99f99ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
@@ -435,7 +435,9 @@ def download_stage0(self):
             llvm_sha = subprocess.check_output([
                 "git", "log", "--author=bors", "--format=%H", "-n1",
                 "-m", "--first-parent",
-                "--", "src/llvm-project"
+                "--",
+                "src/llvm-project",
+                "src/bootstrap/download-ci-llvm-stamp",
             ]).decode(sys.getdefaultencoding()).strip()
             llvm_assertions = self.get_toml('assertions', 'llvm') == 'true'
             if self.program_out_of_date(self.llvm_stamp(), llvm_sha + str(llvm_assertions)):

diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp
@@ -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