Skip to content

Commit

Permalink
Auto merge of #46211 - snipsco:master, r=pnkfelix
Browse files Browse the repository at this point in the history
disable jemalloc on executables for ios targets

This is a (temporary ?) workaround for issue #45262
  • Loading branch information
bors committed Dec 1, 2017
2 parents d1364a6 + 3b18e29 commit 315fbf7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/librustc_back/target/apple_ios_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
})
}

0 comments on commit 315fbf7

Please sign in to comment.