diff options
| author | bors <bors@rust-lang.org> | 2021-01-11 03:24:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-11 03:24:14 +0000 |
| commit | 00c5c3922f5f638b4173bd821f57c94bbb18d43c (patch) | |
| tree | f2b82d9e4272f9bb4b08479fc21ff0110c2d6491 | |
| parent | 26d451f4b3bcbea68eb80856aeddf37af52991ac (diff) | |
| parent | 5de06800c71c2e87fb5a2bfabc57c001f91c9cf3 (diff) | |
| download | rust-00c5c3922f5f638b4173bd821f57c94bbb18d43c.tar.gz rust-00c5c3922f5f638b4173bd821f57c94bbb18d43c.zip | |
Auto merge of #80818 - 12101111:system-libunwind, r=Mark-Simulacrum
Don't build in-tree llvm-libunwind if system-llvm-libunwind is enable When "system-llvm-libunwind" is enabled, some target eg. musl still build in-tree llvm-libunwind which is useless.
| -rw-r--r-- | library/unwind/build.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/unwind/build.rs b/library/unwind/build.rs index fae760c4a4e..694e6b98c82 100644 --- a/library/unwind/build.rs +++ b/library/unwind/build.rs @@ -4,6 +4,10 @@ fn main() { println!("cargo:rerun-if-changed=build.rs"); let target = env::var("TARGET").expect("TARGET was not set"); + if cfg!(feature = "system-llvm-libunwind") { + return; + } + if cfg!(feature = "llvm-libunwind") && ((target.contains("linux") && !target.contains("musl")) || target.contains("fuchsia")) { |