diff options
| author | bors <bors@rust-lang.org> | 2017-09-09 17:32:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-09 17:32:13 +0000 |
| commit | ddd123ed9a35ec76103d42cecf322ee8d2896bf9 (patch) | |
| tree | 03c5d4c8020c62bc36f0486e65de8cae0eaf91a9 /src/libstd/sys_common | |
| parent | 18366f4e8aaec1d46282cf0a6e0fe1a0ab202530 (diff) | |
| parent | aa6bd117bbe05930476b4aec1001fff77ce66348 (diff) | |
| download | rust-ddd123ed9a35ec76103d42cecf322ee8d2896bf9.tar.gz rust-ddd123ed9a35ec76103d42cecf322ee8d2896bf9.zip | |
Auto merge of #44251 - kennytm:osx-backtrace, r=alexcrichton
Add libbacktrace support for Apple platforms (resubmitted) Resubmitting #43422 rebased on the current master (cc @JohnColanduoni). I have added an additional commit to fallback to `dladdr`-based `resolve_symbol` if `libbacktrace` returns `None`, otherwise the stack trace will be full of `<unknown>` when you forget to pass the `-g` flag (actually it seems — at least on macOS — the `dladdr` symbol is more accurate than the `libbacktrace` one).
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index ccd4b91a7b7..30241819bd5 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -51,7 +51,7 @@ pub use sys::net; pub mod net; #[cfg(feature = "backtrace")] -#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))), +#[cfg(any(all(unix, not(target_os = "emscripten")), all(windows, target_env = "gnu"), target_os = "redox"))] pub mod gnu; |