diff options
| author | Dylan McKay <dylanmckay34@gmail.com> | 2015-10-27 23:23:20 +1300 |
|---|---|---|
| committer | Dylan McKay <dylanmckay34@gmail.com> | 2015-10-27 23:23:20 +1300 |
| commit | fd90470b0fa6b0571e78ffda22cbfaf7cb27c146 (patch) | |
| tree | ed29063cd05835333d15ad2ae2a901cb7ad37e0d | |
| parent | cb591e517ab83a9511552b95166640fdc8c11d7e (diff) | |
| download | rust-fd90470b0fa6b0571e78ffda22cbfaf7cb27c146.tar.gz rust-fd90470b0fa6b0571e78ffda22cbfaf7cb27c146.zip | |
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'.
| -rw-r--r-- | mk/clean.mk | 1 | ||||
| -rw-r--r-- | mk/llvm.mk | 2 |
2 files changed, 2 insertions, 1 deletions
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 |