aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Fehér <thomasfeher@web.de>2016-01-09 15:45:41 +0100
committerJustin M. Keyes <justinkz@gmail.com>2016-01-09 12:23:02 -0500
commit50db0312f941ba489466d7d6b21088f1870429ee (patch)
treee901fdfb46c2d8f6c2b946190ebacc8fa649b3af
parentc15446222b3ab0f1c3367a9555037d007e50161f (diff)
downloadrneovim-50db0312f941ba489466d7d6b21088f1870429ee.tar.gz
rneovim-50db0312f941ba489466d7d6b21088f1870429ee.tar.bz2
rneovim-50db0312f941ba489466d7d6b21088f1870429ee.zip
build: ensure static jemalloc. #3970
Otherwise the dynamic library is built also and find_library will prefer that over the static one. That results in linking against the dynamic library which will not be found after install. This code: https://github.com/neovim/neovim/blob/8b3c399b6d7f4a277d80da4b29349fed944f7d46/third-party/CMakeLists.txt#L130 should prevent the above problem, but it doesn't hurt to be explicit.
-rw-r--r--third-party/cmake/BuildJeMalloc.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/third-party/cmake/BuildJeMalloc.cmake b/third-party/cmake/BuildJeMalloc.cmake
index 8b0fac36a4..637aadaad9 100644
--- a/third-party/cmake/BuildJeMalloc.cmake
+++ b/third-party/cmake/BuildJeMalloc.cmake
@@ -19,6 +19,6 @@ ExternalProject_Add(jemalloc
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/jemalloc/configure
CC=${DEPS_C_COMPILER} --prefix=${DEPS_INSTALL_DIR}
BUILD_COMMAND ""
- INSTALL_COMMAND ${MAKE_PRG} install_include install_lib)
+ INSTALL_COMMAND ${MAKE_PRG} install_include install_lib_static)
list(APPEND THIRD_PARTY_DEPS jemalloc)