Skip to content

Commit 87d15c4

Browse files
committed
Fix the Linux nightly build by adding a LLVM_CONFIG_<target-triple> dep.
The RUST_TARGET_STAGE_N rule uses LLVM_LIBDIR_RUSTFLAGS_<target-triple>, which expands to -L "$(llvm-config --libdir)" when the target-triple is also a host-triple. Rather than expand to -L "" if llvm-config has not yet been built, add a dependency on the target llvm-config. When the target-triple is not a host-triple, the new LLVM_CONFIG_$(2) dependency should expand to nothing.
1 parent 1760e87 commit 87d15c4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mk/target.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7373
$$(CRATEFILE_$(4)) \
7474
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
7575
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
76-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
76+
| $$(TLIB$(1)_T_$(2)_H_$(3))/ \
77+
$$(LLVM_CONFIG_$(2))
7778
@$$(call E, rustc: $$(@D)/lib$(4))
7879
@touch $$@.start_time
7980
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \

0 commit comments

Comments
 (0)