From fd90470b0fa6b0571e78ffda22cbfaf7cb27c146 Mon Sep 17 00:00:00 2001
From: Dylan McKay <dylanmckay34@gmail.com>
Date: Tue, 27 Oct 2015 23:23:20 +1300
Subject: [PATCH 1/3] Add dependencies to generated llvmdeps.rs

Previously the file was not regenrated upon modification of src/rustllvm or others.

Now it will be rebuilt if `src/llvm` or `src/rustllvm` is touched.

Also added *.rs rule to 'clean' rule so that it is removed upon 'make
clean'.
---
 mk/clean.mk | 1 +
 mk/llvm.mk  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mk/clean.mk b/mk/clean.mk
index bb79e2186ae15..19a8c3b180663 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -66,6 +66,7 @@ clean-generic-$(2)-$(1):
          -name '*.py' -o \
          -name '*.pyc' -o \
          -name '*.bc' \
+         -name '*.rs' \
          \) \
          | xargs rm -f
 	$(Q)find $(1) \
diff --git a/mk/llvm.mk b/mk/llvm.mk
index 1cbf4a9fb841c..213453a93aa40 100644
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -81,7 +81,7 @@ endif
 
 # LLVM linkage:
 LLVM_LINKAGE_PATH_$(1):=$$(abspath $$(RT_OUTPUT_DIR_$(1))/llvmdeps.rs)
-$$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $$(LLVM_CONFIG_$(1))
+$$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $(S)src/llvm $(S)src/rustllvm $$(LLVM_CONFIG_$(1))
 	$(Q)$(CFG_PYTHON) "$$<" "$$@" "$$(LLVM_COMPONENTS)" "$$(CFG_ENABLE_LLVM_STATIC_STDCPP)" \
 		$$(LLVM_CONFIG_$(1)) "$(CFG_STDCPP_NAME)"
 endef

From 5e9314da18eac9e5de7d5ea68df901b1beaa6ea5 Mon Sep 17 00:00:00 2001
From: Dylan McKay <dylanmckay34@gmail.com>
Date: Tue, 27 Oct 2015 23:47:53 +1300
Subject: [PATCH 2/3] Added missing argument to 'find'

---
 mk/clean.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/clean.mk b/mk/clean.mk
index 19a8c3b180663..ac34ac506bb17 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -65,7 +65,7 @@ clean-generic-$(2)-$(1):
          -name '*.def' -o \
          -name '*.py' -o \
          -name '*.pyc' -o \
-         -name '*.bc' \
+         -name '*.bc' -o \
          -name '*.rs' \
          \) \
          | xargs rm -f

From 9c1dad7b91dd077c7763010e50cb0cdc862849c4 Mon Sep 17 00:00:00 2001
From: Dylan McKay <dylanmckay34@gmail.com>
Date: Wed, 28 Oct 2015 13:11:55 +1300
Subject: [PATCH 3/3] Remove llvmdeps.rs make dependencies on src/llvm and
 src/rustllvm

---
 mk/llvm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/llvm.mk b/mk/llvm.mk
index 213453a93aa40..1cbf4a9fb841c 100644
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -81,7 +81,7 @@ endif
 
 # LLVM linkage:
 LLVM_LINKAGE_PATH_$(1):=$$(abspath $$(RT_OUTPUT_DIR_$(1))/llvmdeps.rs)
-$$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $(S)src/llvm $(S)src/rustllvm $$(LLVM_CONFIG_$(1))
+$$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $$(LLVM_CONFIG_$(1))
 	$(Q)$(CFG_PYTHON) "$$<" "$$@" "$$(LLVM_COMPONENTS)" "$$(CFG_ENABLE_LLVM_STATIC_STDCPP)" \
 		$$(LLVM_CONFIG_$(1)) "$(CFG_STDCPP_NAME)"
 endef