aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2015-02-01 07:09:21 -0500
committerJohn Szakmeister <john@szakmeister.net>2015-02-01 07:09:21 -0500
commit75d5fcce045495c30df6bf6ab39453f190a28d89 (patch)
treedeee0240f5ad94d3d65b3386aad80677675ae4d6
parented03d43d8bf6ce7440dbe877c15bee1218411363 (diff)
downloadrneovim-75d5fcce045495c30df6bf6ab39453f190a28d89.tar.gz
rneovim-75d5fcce045495c30df6bf6ab39453f190a28d89.tar.bz2
rneovim-75d5fcce045495c30df6bf6ab39453f190a28d89.zip
Fix #1920: Unable to build on openSUSE 13.2 x64
The issue is that libuv decides to use ${PREFIX}/lib64 as the lib directory instead of ${PREFIX}/lib. Since we're just installing it to provide access to the static library, let's just force the libdir to be ${PREFIX}/lib.
-rw-r--r--third-party/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 8a090a26e9..8c7eef49d6 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -164,7 +164,8 @@ if(USE_BUNDLED_LIBUV)
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh &&
${DEPS_BUILD_DIR}/src/libuv/configure --with-pic --disable-shared
- --prefix=${DEPS_INSTALL_DIR} CC=${DEPS_C_COMPILER}
+ --prefix=${DEPS_INSTALL_DIR} --libdir=${DEPS_INSTALL_DIR}/lib
+ CC=${DEPS_C_COMPILER}
INSTALL_COMMAND ${MAKE_PRG} install)
list(APPEND THIRD_PARTY_DEPS libuv)
endif()