Skip to content

Commit 7fce503

Browse files
committed
Auto merge of #31470 - alexcrichton:lets-find-jemalloc, r=brson
Both of these targets have jemalloc disabled unconditionally right now, so using `maybe_jemalloc` here isn't right. This fixes the case where a Linux compiler (which is itself configured to use jemalloc) attempts to cross-compile to MinGW, causing it to try to find an `alloc_jemalloc` crate (and failing).
2 parents 73132ca + 79a6373 commit 7fce503

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

src/librustc_back/target/windows_base.rs

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ pub fn opts() -> TargetOptions {
8484
"rsend.o".to_string()
8585
),
8686
custom_unwind_resume: true,
87-
exe_allocation_crate: super::maybe_jemalloc(),
8887

8988
.. Default::default()
9089
}

src/librustc_back/target/x86_64_rumprun_netbsd.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pub fn target() -> Target {
2121
base.position_independent_executables = false;
2222
base.disable_redzone = true;
2323
base.no_default_libraries = false;
24+
base.exe_allocation_crate = "alloc_system".to_string();
2425

2526
Target {
2627
llvm_target: "x86_64-rumprun-netbsd".to_string(),

0 commit comments

Comments
 (0)