diff options
| author | bors <bors@rust-lang.org> | 2016-02-07 23:31:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-07 23:31:46 +0000 |
| commit | 7fce5037a9040a3443f796c577b88d50ca5846a0 (patch) | |
| tree | 5206e3b2c4660f3c97ef3b39addc54832d12afcc | |
| parent | 73132caa0bb7d9e4eb7531cc729c4323adbdee54 (diff) | |
| parent | 79a63735730c4da0c19c46f914f8dba37fea7b5a (diff) | |
| download | rust-7fce5037a9040a3443f796c577b88d50ca5846a0.tar.gz rust-7fce5037a9040a3443f796c577b88d50ca5846a0.zip | |
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).
| -rw-r--r-- | src/librustc_back/target/windows_base.rs | 1 | ||||
| -rw-r--r-- | src/librustc_back/target/x86_64_rumprun_netbsd.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_back/target/windows_base.rs b/src/librustc_back/target/windows_base.rs index 634a63cf0bb..4eacea3fcd9 100644 --- a/src/librustc_back/target/windows_base.rs +++ b/src/librustc_back/target/windows_base.rs @@ -84,7 +84,6 @@ pub fn opts() -> TargetOptions { "rsend.o".to_string() ), custom_unwind_resume: true, - exe_allocation_crate: super::maybe_jemalloc(), .. Default::default() } diff --git a/src/librustc_back/target/x86_64_rumprun_netbsd.rs b/src/librustc_back/target/x86_64_rumprun_netbsd.rs index d63ad53cc2b..c97b434b9e0 100644 --- a/src/librustc_back/target/x86_64_rumprun_netbsd.rs +++ b/src/librustc_back/target/x86_64_rumprun_netbsd.rs @@ -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(), |