File tree 2 files changed +6
-2
lines changed
2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 322
322
// if the user has disabled jemalloc in `./configure`).
323
323
// `force_alloc_system` is *only* intended as a workaround for local rebuilds
324
324
// with a rustc without jemalloc.
325
- #![ cfg_attr( any( stage0, feature = "force_alloc_system" ) ,
325
+ // FIXME(#44236) shouldn't need MSVC logic
326
+ #![ cfg_attr( all( not( target_env = "msvc" ) ,
327
+ any( stage0, feature = "force_alloc_system" ) ) ,
326
328
feature( global_allocator) ) ]
327
- #[ cfg( any( stage0, feature = "force_alloc_system" ) ) ]
329
+ #[ cfg( all( not( target_env = "msvc" ) ,
330
+ any( stage0, feature = "force_alloc_system" ) ) ) ]
328
331
#[ global_allocator]
329
332
static ALLOC : alloc_system:: System = alloc_system:: System ;
330
333
Original file line number Diff line number Diff line change @@ -65,6 +65,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
65
65
"src/rtstartup" , // Not sure what to do about this. magic stuff for mingw
66
66
67
67
// temporary exceptions
68
+ "src/libstd/lib.rs" , // FIXME(#44217)
68
69
"src/libstd/path.rs" ,
69
70
"src/libstd/f32.rs" ,
70
71
"src/libstd/f64.rs" ,
You can’t perform that action at this time.
0 commit comments