about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-01-09 01:58:47 +0800
committerGitHub <noreply@github.com>2018-01-09 01:58:47 +0800
commit9214e9b0ae77803cc8e5becd869681b9a3f17dcb (patch)
tree565f33f178f12233e8c2fdef1bf6c1020819e438 /src/libstd/sys
parent1cbbbc094440e32c2eacc3dec395c609e1ae8c63 (diff)
parentfd37526fa5046acdb2dbf573e815cc4c8b02cb78 (diff)
downloadrust-9214e9b0ae77803cc8e5becd869681b9a3f17dcb.tar.gz
rust-9214e9b0ae77803cc8e5becd869681b9a3f17dcb.zip
Rollup merge of #47246 - aidanhs:aphs-wasm-backtrace-feature, r=KodrAus
Make wasm obey backtrace feature, like other targets

E.g. https://github.com/rust-lang/rust/blob/6828cf90146c7fefc4ba4f16dffe75f763f2d910/src/libstd/sys/unix/mod.rs#L40-L41
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/wasm/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/wasm/mod.rs b/src/libstd/sys/wasm/mod.rs
index b838dbafd6f..ba3d6a2813a 100644
--- a/src/libstd/sys/wasm/mod.rs
+++ b/src/libstd/sys/wasm/mod.rs
@@ -39,6 +39,7 @@ use os::raw::c_char;
 const DEBUG: bool = false;
 
 pub mod args;
+#[cfg(feature = "backtrace")]
 pub mod backtrace;
 pub mod cmath;
 pub mod condvar;