diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-23 15:55:35 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-02-06 08:42:54 -0800 |
| commit | 77c3bfa7429abf87b76ba84108df018d9e9d90e2 (patch) | |
| tree | dbcf69224b24f6820dfe103713a837e0074f0567 /src/libstd/sys_common | |
| parent | ce4abc35150425ac5ddf460b5a7b444da2140009 (diff) | |
| download | rust-77c3bfa7429abf87b76ba84108df018d9e9d90e2.tar.gz rust-77c3bfa7429abf87b76ba84108df018d9e9d90e2.zip | |
std: Remove cfg(cargobuild) annotations
These are all now no longer needed that we've only got rustbuild in tree.
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/gnu/libbacktrace.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libstd/sys_common/gnu/libbacktrace.rs b/src/libstd/sys_common/gnu/libbacktrace.rs index d464a13ad1d..0bdbeddb112 100644 --- a/src/libstd/sys_common/gnu/libbacktrace.rs +++ b/src/libstd/sys_common/gnu/libbacktrace.rs @@ -39,9 +39,6 @@ pub fn print(w: &mut Write, idx: isize, addr: *mut libc::c_void, msg: *const libc::c_char, errnum: libc::c_int); enum backtrace_state {} - #[link(name = "backtrace", kind = "static")] - #[cfg(all(not(test), not(cargobuild)))] - extern {} extern { fn backtrace_create_state(filename: *const libc::c_char, diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index 634d6258885..d4d3365dc01 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -29,7 +29,7 @@ use sync::Once; use sys; pub mod at_exit_imp; -#[cfg(any(not(cargobuild), feature = "backtrace"))] +#[cfg(feature = "backtrace")] pub mod backtrace; pub mod condvar; pub mod io; @@ -50,7 +50,7 @@ pub use sys::net; #[cfg(not(target_os = "redox"))] pub mod net; -#[cfg(any(not(cargobuild), feature = "backtrace"))] +#[cfg(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; |