From fd90470b0fa6b0571e78ffda22cbfaf7cb27c146 Mon Sep 17 00:00:00 2001 From: Dylan McKay Date: Tue, 27 Oct 2015 23:23:20 +1300 Subject: [PATCH] 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 bb79e2186ae..19a8c3b1806 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 1cbf4a9fb84..213453a93aa 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