]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #43579 - cuviper:extern-llvm-features, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 2 Aug 2017 01:13:02 +0000 (01:13 +0000)
committerbors <bors@rust-lang.org>
Wed, 2 Aug 2017 01:13:02 +0000 (01:13 +0000)
Gate LLVMRustHasFeature on LLVM_RUSTLLVM

Commit c4710203c098b in #43492 make `LLVMRustHasFeature` "more robust"
by using `getFeatureTable()`.  However, this function is specific to
Rust's own LLVM fork, not upstream LLVM-4.0, so we need to use
`#if LLVM_RUSTLLVM` to guard this call.

Closes #43555.


Trivial merge