about summary refs log tree commit diff
path: root/src/libstd/sys_common
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-07-14 20:57:18 -0700
committerGitHub <noreply@github.com>2017-07-14 20:57:18 -0700
commit57bc82d637905457a2ae4869e21302d576209cb8 (patch)
treede0f9fbedc9333419149094e02992f55ce0d3980 /src/libstd/sys_common
parent877e62e471d9e8bcfbc1f8069d8d98e6a6c53e29 (diff)
parent5757e0561975b40f81a739feb73abdc377eeda3a (diff)
downloadrust-57bc82d637905457a2ae4869e21302d576209cb8.tar.gz
rust-57bc82d637905457a2ae4869e21302d576209cb8.zip
Rollup merge of #43228 - redox-os:backtrace_fix, r=alexcrichton
Fix backtrace on Redox

This fixes sys::backtrace on Redox
Diffstat (limited to 'src/libstd/sys_common')
-rw-r--r--src/libstd/sys_common/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
index d4d3365dc01..ccd4b91a7b7 100644
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
@@ -52,7 +52,8 @@ pub mod net;
 
 #[cfg(feature = "backtrace")]
 #[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))),
-          all(windows, target_env = "gnu")))]
+          all(windows, target_env = "gnu"),
+          target_os = "redox"))]
 pub mod gnu;
 
 // common error constructors