diff options
| author | kennytm <kennytm@gmail.com> | 2018-05-06 01:02:05 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-05-06 02:34:07 +0800 |
| commit | 02f6a0335f99378b2e7d630e00aabdeb57a5bd25 (patch) | |
| tree | e48a47269b8579988639f1774341b756814ff6ab /src/libstd/lib.rs | |
| parent | f24915b67fafe33e87e685d884ff63389b6967cb (diff) | |
| download | rust-02f6a0335f99378b2e7d630e00aabdeb57a5bd25.tar.gz rust-02f6a0335f99378b2e7d630e00aabdeb57a5bd25.zip | |
Some final touches to ensure `./x.py test --stage 0 src/lib*` works
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index fc05833e285..d41739ab02c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -330,10 +330,10 @@ // with a rustc without jemalloc. // FIXME(#44236) shouldn't need MSVC logic #![cfg_attr(all(not(target_env = "msvc"), - any(stage0, feature = "force_alloc_system")), + any(all(stage0, not(test)), feature = "force_alloc_system")), feature(global_allocator))] #[cfg(all(not(target_env = "msvc"), - any(stage0, feature = "force_alloc_system")))] + any(all(stage0, not(test)), feature = "force_alloc_system")))] #[global_allocator] static ALLOC: alloc_system::System = alloc_system::System; |