mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-27 14:24:08 +00:00
Rollup merge of #28193 - dhuseby:fixing_bitrig_alloc_crate_tests, r=alexcrichton
@alexcrichton this will get the bitrig buildbot back to green.
This commit is contained in:
commit
75ca401f2d
@ -10,6 +10,7 @@
|
||||
|
||||
// ignore-msvc everything is the system allocator on msvc
|
||||
// ignore-musl no dylibs on musl yet
|
||||
// ignore-bitrig no jemalloc on bitrig
|
||||
// aux-build:allocator-dylib.rs
|
||||
// no-prefer-dynamic
|
||||
// error-pattern: cannot link together two allocators
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
// ignore-msvc everything is the system allocator on msvc
|
||||
// ignore-musl no dylibs on musl right now
|
||||
// ignore-bitrig no jemalloc on bitrig
|
||||
// aux-build:allocator-dylib2.rs
|
||||
// error-pattern: cannot link together two allocators
|
||||
|
||||
|
@ -10,9 +10,9 @@
|
||||
|
||||
#![feature(alloc_jemalloc, alloc_system)]
|
||||
|
||||
#[cfg(not(target_env = "msvc"))]
|
||||
#[cfg(not(any(target_env = "msvc", target_os = "bitrig")))]
|
||||
extern crate alloc_jemalloc;
|
||||
#[cfg(target_env = "msvc")]
|
||||
#[cfg(any(target_env = "msvc", target_os = "bitrig"))]
|
||||
extern crate alloc_system;
|
||||
|
||||
fn main() {
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
// no-prefer-dynamic
|
||||
// ignore-msvc no jemalloc on msvc
|
||||
// ignore-bitrig no jemalloc on bitrig either
|
||||
|
||||
#![feature(alloc_jemalloc)]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user