From e1daa36ba7df88788c2684bbe5ff6eb37f1cda69 Mon Sep 17 00:00:00 2001
From: Andy Russell <arussell123@gmail.com>
Date: Tue, 19 Mar 2019 16:54:22 -0400
Subject: [PATCH] replace llvm-rebuild-trigger with commit hash

---
 src/bootstrap/native.rs           | 48 +++++++++++++++++++++----------
 src/rustllvm/llvm-rebuild-trigger |  4 ---
 2 files changed, 33 insertions(+), 19 deletions(-)
 delete mode 100644 src/rustllvm/llvm-rebuild-trigger

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 3babbc9e10231..d93b0f2e0d4b0 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -67,30 +67,47 @@ impl Step for Llvm {
             }
         }
 
-        let rebuild_trigger = builder.src.join("src/rustllvm/llvm-rebuild-trigger");
-        let rebuild_trigger_contents = t!(fs::read_to_string(&rebuild_trigger));
-
-        let (out_dir, llvm_config_ret_dir) = if emscripten {
+        let (submodule, root, out_dir, llvm_config_ret_dir) = if emscripten {
             let dir = builder.emscripten_llvm_out(target);
             let config_dir = dir.join("bin");
-            (dir, config_dir)
+            ("src/llvm-emscripten", "src/llvm-emscripten", dir, config_dir)
         } else {
             let mut dir = builder.llvm_out(builder.config.build);
             if !builder.config.build.contains("msvc") || builder.config.ninja {
                 dir.push("build");
             }
-            (builder.llvm_out(target), dir.join("bin"))
+            ("src/llvm-project", "src/llvm-project/llvm", builder.llvm_out(target), dir.join("bin"))
         };
-        let done_stamp = out_dir.join("llvm-finished-building");
+
+        let git_output = t!(Command::new("git")
+            .args(&["rev-parse", "--verify", &format!("@:./{}", submodule)])
+            .current_dir(&builder.src)
+            .output());
+
+        let llvm_commit = if git_output.status.success() {
+            Some(git_output.stdout)
+        } else {
+            println!(
+                "git could not determine the LLVM submodule commit hash ({}). \
+                Assuming that an LLVM build is necessary.",
+                String::from_utf8_lossy(&git_output.stderr),
+            );
+            None
+        };
+
         let build_llvm_config = llvm_config_ret_dir
             .join(exe("llvm-config", &*builder.config.build));
-        if done_stamp.exists() {
-            let done_contents = t!(fs::read_to_string(&done_stamp));
+        let done_stamp = out_dir.join("llvm-finished-building");
 
-            // If LLVM was already built previously and contents of the rebuild-trigger file
-            // didn't change from the previous build, then no action is required.
-            if done_contents == rebuild_trigger_contents {
-                return build_llvm_config
+        if let Some(llvm_commit) = &llvm_commit {
+            if done_stamp.exists() {
+                let done_contents = t!(fs::read(&done_stamp));
+
+                // If LLVM was already built previously and the submodule's commit didn't change
+                // from the previous build, then no action is required.
+                if done_contents == llvm_commit.as_slice() {
+                    return build_llvm_config
+                }
             }
         }
 
@@ -101,7 +118,6 @@ impl Step for Llvm {
         t!(fs::create_dir_all(&out_dir));
 
         // http://llvm.org/docs/CMake.html
-        let root = if self.emscripten { "src/llvm-emscripten" } else { "src/llvm-project/llvm" };
         let mut cfg = cmake::Config::new(builder.src.join(root));
 
         let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) {
@@ -279,7 +295,9 @@ impl Step for Llvm {
 
         cfg.build();
 
-        t!(fs::write(&done_stamp, &rebuild_trigger_contents));
+        if let Some(llvm_commit) = llvm_commit {
+            t!(fs::write(&done_stamp, &llvm_commit));
+        }
 
         build_llvm_config
     }
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger
deleted file mode 100644
index 0f18c6a4ac019..0000000000000
--- a/src/rustllvm/llvm-rebuild-trigger
+++ /dev/null
@@ -1,4 +0,0 @@
-# If this file is modified, then llvm will be (optionally) cleaned and then rebuilt.
-# The actual contents of this file do not matter, but to trigger a change on the
-# build bots then the contents should be changed so git updates the mtime.
-2019-03-18