about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-23 19:42:19 +0000
committerbors <bors@rust-lang.org>2021-05-23 19:42:19 +0000
commitf64503eb555475d65ae5503ef22439ca5dd394fd (patch)
tree4caa83f52b8b3fd06eb95779bbc90ad87cc88f8e /compiler/rustc_codegen_llvm/src
parentd8af907491e20339e41d048d6a32b41ddfa91dfe (diff)
parent8e42fa55dbaec9a6560b59fb023e50713ef94e93 (diff)
downloadrust-f64503eb555475d65ae5503ef22439ca5dd394fd.tar.gz
rust-f64503eb555475d65ae5503ef22439ca5dd394fd.zip
Auto merge of #85554 - 12101111:fix-dedup-native-libs, r=petrochenkov
native lib: defer the duplicate check after relevant_lib check.

https://github.com/rust-lang/rust/pull/84794 break code using conditional-compilation with `#[link]` attributes.

```rust
#[cfg(target_env = "musl")]
cfg_if::cfg_if! {
    if #[cfg(any(target_feature = "crt-static", feature = "llvm-libunwind"))] {
        #[link(name = "unwind", kind = "static", modifiers = "-bundle")]
        extern "C" {}
    } else {
        #[link(name = "unwind", cfg(feature = "system-llvm-libunwind"))]
        #[link(name = "gcc_s", cfg(not(feature = "system-llvm-libunwind")))]
        extern "C" {}
    }
}

```
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions