Skip to content

Commit

Permalink
rustc: Tweak exe allocator for MinGW/rumprun
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
alexcrichton committed Feb 7, 2016
1 parent f50fb15 commit 79a6373
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion src/librustc_back/target/windows_base.rs
Expand Up @@ -84,7 +84,6 @@ pub fn opts() -> TargetOptions {
"rsend.o".to_string()
),
custom_unwind_resume: true,
exe_allocation_crate: super::maybe_jemalloc(),

.. Default::default()
}
Expand Down
1 change: 1 addition & 0 deletions src/librustc_back/target/x86_64_rumprun_netbsd.rs
Expand Up @@ -21,6 +21,7 @@ pub fn target() -> Target {
base.position_independent_executables = false;
base.disable_redzone = true;
base.no_default_libraries = false;
base.exe_allocation_crate = "alloc_system".to_string();

Target {
llvm_target: "x86_64-rumprun-netbsd".to_string(),
Expand Down

0 comments on commit 79a6373

Please sign in to comment.