diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-07-07 11:26:20 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-07-07 14:33:54 -0400 |
| commit | 35fad15c8907f741ce21779393e4377de753e4f9 (patch) | |
| tree | bc9d968b2fbfeca3281c56dd8a000dd36e2789bf | |
| parent | 773ea9dbdccd9252b0901e64ccb1c4fef6ca7cb9 (diff) | |
| download | rneovim-35fad15c8907f741ce21779393e4377de753e4f9.tar.gz rneovim-35fad15c8907f741ce21779393e4377de753e4f9.tar.bz2 rneovim-35fad15c8907f741ce21779393e4377de753e4f9.zip | |
Prefer the static jemalloc library by default on OSX
When neovim is dynamically linked against jemalloc on OSX, users are
hitting the deadlock described in jemalloc/jemalloc#895.
| -rw-r--r-- | cmake/FindJeMalloc.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/FindJeMalloc.cmake b/cmake/FindJeMalloc.cmake index 820ceeed4a..f139196a38 100644 --- a/cmake/FindJeMalloc.cmake +++ b/cmake/FindJeMalloc.cmake @@ -27,6 +27,9 @@ find_path(JEMALLOC_INCLUDE_DIR jemalloc/jemalloc.h if(JEMALLOC_USE_STATIC) list(APPEND JEMALLOC_NAMES "${CMAKE_STATIC_LIBRARY_PREFIX}jemalloc${CMAKE_STATIC_LIBRARY_SUFFIX}") +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + list(INSERT JEMALLOC_NAMES 0 + "${CMAKE_STATIC_LIBRARY_PREFIX}jemalloc${CMAKE_STATIC_LIBRARY_SUFFIX}") endif() list(APPEND JEMALLOC_NAMES jemalloc) |