diff options
| author | bors <bors@rust-lang.org> | 2017-12-23 15:46:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-23 15:46:18 +0000 |
| commit | 2b55e3522c0c1f6e0f3d54bd2be97eab0852e57b (patch) | |
| tree | 36bbaa15236636a762f33f80e940d42889dbd050 | |
| parent | e878c67096673595f89cd8344049538abca5affb (diff) | |
| parent | ab13ec063dfa02643989841697f2c7a49a93f46e (diff) | |
| download | rust-2b55e3522c0c1f6e0f3d54bd2be97eab0852e57b.tar.gz rust-2b55e3522c0c1f6e0f3d54bd2be97eab0852e57b.zip | |
Auto merge of #46912 - pnkfelix:backport-46211-to-beta, r=kennytm
Backport to beta: disable jemalloc on executables for ios targets Back port of #46211
| -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() }) } |
