From b60e5c85adb597f5a1688de47198175b2747fbd4 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 25 Mar 2017 23:02:20 +0100 Subject: cmake: USE_BUNDLED_X instead of X_USE_BUNDLED (#6357) --- cmake/FindJeMalloc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/FindJeMalloc.cmake') diff --git a/cmake/FindJeMalloc.cmake b/cmake/FindJeMalloc.cmake index f36cbc6f7a..820ceeed4a 100644 --- a/cmake/FindJeMalloc.cmake +++ b/cmake/FindJeMalloc.cmake @@ -4,7 +4,7 @@ # JEMALLOC_INCLUDE_DIRS - The jemalloc include directories # JEMALLOC_LIBRARIES - The libraries needed to use jemalloc -if(NOT JEMALLOC_USE_BUNDLED) +if(NOT USE_BUNDLED_JEMALLOC) find_package(PkgConfig) if (PKG_CONFIG_FOUND) pkg_check_modules(PC_JEMALLOC QUIET jemalloc) -- cgit From 35fad15c8907f741ce21779393e4377de753e4f9 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 7 Jul 2017 11:26:20 -0400 Subject: 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. --- cmake/FindJeMalloc.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmake/FindJeMalloc.cmake') 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) -- cgit