From 774fbdf40deb9b257dd6aa166096fed1eeac80c2 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 26 Jul 2016 22:33:45 -0500 Subject: keep backtraces if using the old build system --- src/libstd/sys/common/mod.rs | 4 ++-- src/libstd/sys/unix/mod.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/sys') diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs index 67b19682fc9..a1f3f477b3a 100644 --- a/src/libstd/sys/common/mod.rs +++ b/src/libstd/sys/common/mod.rs @@ -28,7 +28,7 @@ macro_rules! rtassert { pub mod args; pub mod at_exit_imp; -#[cfg(feature = "backtrace")] +#[cfg(any(not(cargobuild), feature = "backtrace"))] pub mod backtrace; pub mod condvar; pub mod io; @@ -43,7 +43,7 @@ pub mod thread_local; pub mod util; pub mod wtf8; -#[cfg(feature = "backtrace")] +#[cfg(any(not(cargobuild), feature = "backtrace"))] #[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))), all(windows, target_env = "gnu")))] pub mod gnu; diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs index 9aac7be8017..1c25c8f77c1 100644 --- a/src/libstd/sys/unix/mod.rs +++ b/src/libstd/sys/unix/mod.rs @@ -30,7 +30,7 @@ use libc; pub mod weak; pub mod android; -#[cfg(feature = "backtrace")] +#[cfg(any(not(cargobuild), feature = "backtrace"))] pub mod backtrace; pub mod condvar; pub mod ext; -- cgit 1.4.1-3-g733a5