Skip to content

Commit fd90470

Browse files
author
Dylan McKay
committed
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'.
1 parent cb591e5 commit fd90470

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

mk/clean.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ clean-generic-$(2)-$(1):
6666
-name '*.py' -o \
6767
-name '*.pyc' -o \
6868
-name '*.bc' \
69+
-name '*.rs' \
6970
\) \
7071
| xargs rm -f
7172
$(Q)find $(1) \

mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ endif
8181

8282
# LLVM linkage:
8383
LLVM_LINKAGE_PATH_$(1):=$$(abspath $$(RT_OUTPUT_DIR_$(1))/llvmdeps.rs)
84-
$$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $$(LLVM_CONFIG_$(1))
84+
$$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $(S)src/llvm $(S)src/rustllvm $$(LLVM_CONFIG_$(1))
8585
$(Q)$(CFG_PYTHON) "$$<" "$$@" "$$(LLVM_COMPONENTS)" "$$(CFG_ENABLE_LLVM_STATIC_STDCPP)" \
8686
$$(LLVM_CONFIG_$(1)) "$(CFG_STDCPP_NAME)"
8787
endef

0 commit comments

Comments
 (0)