]> git.lizzy.rs Git - rust.git/commit
Auto merge of #23429 - rprichard:fix-linux-build, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 17 Mar 2015 05:57:14 +0000 (05:57 +0000)
committerbors <bors@rust-lang.org>
Tue, 17 Mar 2015 05:57:14 +0000 (05:57 +0000)
commit883551b1d739993dffcba01ee9ea3237cf406d9a
tree520e5db397325d018c481b2730017b982e1cf87b
parente46610966f798a083350724461648c6ffdd151f4
parentb07a1dfcd12348541e81c809b59af9ff56fc1103
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