diff options
| author | bors <bors@rust-lang.org> | 2020-02-12 16:25:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-12 16:25:13 +0000 |
| commit | 2d2be570970d784db5539a1d309cd22b85be910a (patch) | |
| tree | 52c9407b54a2b5c06af608699528a311406a4e78 /src/librustc_codegen_llvm/llvm/mod.rs | |
| parent | 2ed25f069768c046464e68fd382c867ddb04a1e3 (diff) | |
| parent | d9982f1f817e67149316b60fbacb0425e7179365 (diff) | |
Auto merge of #69094 - Dylan-DPC:rollup-4qe7uv1, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #67585 (Improve `char::is_ascii_*` codegen) - #68914 (Speed up `SipHasher128`.) - #68994 (rustbuild: include channel in sanitizers installed name) - #69032 (ICE in nightly-2020-02-08: handle TerminatorKind::Yield in librustc_mir::transform::promote_consts::Validator method) - #69034 (parser: Remove `Parser::prev_token_kind`) - #69042 (Remove backtrace header text) - #69059 (Remove a few unused objects) - #69089 (Properly use the darwin archive format on Apple targets) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm/llvm/mod.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_codegen_llvm/llvm/mod.rs b/src/librustc_codegen_llvm/llvm/mod.rs index eb13d6a575f..96014cbee5d 100644 --- a/src/librustc_codegen_llvm/llvm/mod.rs +++ b/src/librustc_codegen_llvm/llvm/mod.rs @@ -69,6 +69,7 @@ impl FromStr for ArchiveKind { match s { "gnu" => Ok(ArchiveKind::K_GNU), "bsd" => Ok(ArchiveKind::K_BSD), + "darwin" => Ok(ArchiveKind::K_DARWIN), "coff" => Ok(ArchiveKind::K_COFF), _ => Err(()), } |