aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-07-07 15:46:39 -0400
committerGitHub <noreply@github.com>2017-07-07 15:46:39 -0400
commit226603a8d8d4f7d0238e4d7f572751bc6dcd12a1 (patch)
treebc9d968b2fbfeca3281c56dd8a000dd36e2789bf
parent773ea9dbdccd9252b0901e64ccb1c4fef6ca7cb9 (diff)
parent35fad15c8907f741ce21779393e4377de753e4f9 (diff)
downloadrneovim-226603a8d8d4f7d0238e4d7f572751bc6dcd12a1.tar.gz
rneovim-226603a8d8d4f7d0238e4d7f572751bc6dcd12a1.tar.bz2
rneovim-226603a8d8d4f7d0238e4d7f572751bc6dcd12a1.zip
Merge pull request #6979 from jamessan/avoid-jemalloc-on-osx
Prefer the static jemalloc library by default on OSX
-rw-r--r--cmake/FindJeMalloc.cmake3
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)