Skip to content

Commit 883551b

Browse files
committed
Auto merge of rust-lang#23429 - rprichard:fix-linux-build, r=alexcrichton
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. r? alexcrichton
2 parents e466109 + b07a1df commit 883551b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

mk/target.mk

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
7272
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7373
$$(CRATEFILE_$(4)) \
7474
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
75+
$$(LLVM_CONFIG_$(2)) \
7576
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
7677
| $$(TLIB$(1)_T_$(2)_H_$(3))/
7778
@$$(call E, rustc: $$(@D)/lib$(4))

0 commit comments

Comments
 (0)