Skip to content

Commit

Permalink
std: link to liballoc_system if compiled without the jemalloc feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Jorge Aparicio committed Dec 23, 2016
1 parent 99913c5 commit 0b1fa98
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@

// Always use alloc_system during stage0 since jemalloc might be unavailable or
// disabled (Issue #30592)
#![cfg_attr(stage0, feature(alloc_system))]
#![cfg_attr(any(stage0, not(feature = "jemalloc")), feature(alloc_system))]

// Turn warnings into errors, but only after stage0, where it can be useful for
// code to emit warnings during language transitions
Expand Down Expand Up @@ -331,7 +331,7 @@ extern crate libc;
// We always need an unwinder currently for backtraces
extern crate unwind;

#[cfg(stage0)]
#[cfg(any(stage0, not(feature = "jemalloc")))]
extern crate alloc_system;

// compiler-rt intrinsics
Expand Down

0 comments on commit 0b1fa98

Please sign in to comment.