diff options
| author | bors <bors@rust-lang.org> | 2017-12-01 08:44:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-01 08:44:42 +0000 |
| commit | 315fbf7518dbcace5b92eabab746ba0a2c5531fa (patch) | |
| tree | 5daeabfe18a08e0a8aa70d61788ac87bd2112950 | |
| parent | d1364a65c0e064ee12aea8d58aceb403b8200682 (diff) | |
| parent | 3b18e29d2cca13581acc6b5e7f7d47b180470e74 (diff) | |
Auto merge of #46211 - snipsco:master, r=pnkfelix
disable jemalloc on executables for ios targets This is a (temporary ?) workaround for issue #45262
| -rw-r--r-- | src/librustc_back/target/apple_ios_base.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/librustc_back/target/apple_ios_base.rs b/src/librustc_back/target/apple_ios_base.rs index 4b02d0b60b8..1895ab1eb7e 100644 --- a/src/librustc_back/target/apple_ios_base.rs +++ b/src/librustc_back/target/apple_ios_base.rs @@ -99,6 +99,10 @@ pub fn opts(arch: Arch) -> Result<TargetOptions, String> { executables: true, pre_link_args, has_elf_tls: false, + // The following line is a workaround for jemalloc 4.5 being broken on + // ios. jemalloc 5.0 is supposed to fix this. + // see https://github.com/rust-lang/rust/issues/45262 + exe_allocation_crate: None, .. super::apple_base::opts() }) } |
