nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add dependencies to generated llvmdeps.rs

Browse Source 
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'.
This commit is contained in:
Dylan McKay 2015-10-27 23:23:20 +13:00
parent cb591e517a
commit fd90470b0f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mk/clean.mk
View File

@ -66,6 +66,7 @@ clean-generic-$(2)-$(1):
-name '*.py' -o \ -name '*.py' -o \
-name '*.pyc' -o \ -name '*.pyc' -o \
-name '*.bc' \ -name '*.bc' \
-name '*.rs' \
\) \ \) \
| xargs rm -f | xargs rm -f
$(Q)find $(1) \ $(Q)find $(1) \

2
mk/llvm.mk
View File

@ -81,7 +81,7 @@ endif
# LLVM linkage: # LLVM linkage:
LLVM_LINKAGE_PATH_$(1):=$$(abspath $$(RT_OUTPUT_DIR_$(1))/llvmdeps.rs) 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)" \ $(Q)$(CFG_PYTHON) "$$<" "$$@" "$$(LLVM_COMPONENTS)" "$$(CFG_ENABLE_LLVM_STATIC_STDCPP)" \
$$(LLVM_CONFIG_$(1)) "$(CFG_STDCPP_NAME)" $$(LLVM_CONFIG_$(1)) "$(CFG_STDCPP_NAME)"
endef endef