diff options
| author | bors <bors@rust-lang.org> | 2015-03-17 05:57:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-17 05:57:14 +0000 |
| commit | 883551b1d739993dffcba01ee9ea3237cf406d9a (patch) | |
| tree | 520e5db397325d018c481b2730017b982e1cf87b | |
| parent | e46610966f798a083350724461648c6ffdd151f4 (diff) | |
| parent | b07a1dfcd12348541e81c809b59af9ff56fc1103 (diff) | |
Auto merge of #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
| -rw-r--r-- | mk/target.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mk/target.mk b/mk/target.mk index 0a41f363649..da18a9a4392 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -72,6 +72,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2) $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ $$(CRATEFILE_$(4)) \ $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ + $$(LLVM_CONFIG_$(2)) \ $$(TSREQ$(1)_T_$(2)_H_$(3)) \ | $$(TLIB$(1)_T_$(2)_H_$(3))/ @$$(call E, rustc: $$(@D)/lib$(4)) |