aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Personette <dperson@gmail.com>2016-07-25 08:08:24 -0400
committerMarco Hinz <mh.codebro@gmail.com>2016-07-25 20:56:52 +0200
commit67062d20ede952f0658f2418867adce381a69c64 (patch)
tree205200796894aa3e0453eee2fb137093f0bf6a19
parentfbb2cd791d0c79a52bd7fcf9e3a569fa9d306b6a (diff)
downloadrneovim-67062d20ede952f0658f2418867adce381a69c64.tar.gz
rneovim-67062d20ede952f0658f2418867adce381a69c64.tar.bz2
rneovim-67062d20ede952f0658f2418867adce381a69c64.zip
CMake: fix USE_BUNDLED_LIBUV
Closes #5114.
-rw-r--r--third-party/cmake/BuildLuarocks.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 069c94ea2e..0041bb1a03 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -142,9 +142,13 @@ if(USE_BUNDLED_BUSTED)
if(MINGW AND CMAKE_CROSSCOMPILING)
set(LUV_DEPS ${LUV_DEPS} libuv_host)
endif()
+ set(LUV_ARGS CFLAGS='-O0 -g3 -fPIC')
+ if(USE_BUNDLED_LIBUV)
+ set(LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR} CFLAGS='-O0 -g3 -fPIC')
+ endif()
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv
COMMAND ${LUAROCKS_BINARY}
- ARGS make ${LUAROCKS_BUILDARGS} LIBUV_DIR=${HOSTDEPS_INSTALL_DIR} CFLAGS='-O0 -g3 -fPIC'
+ ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS}
WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
DEPENDS ${LUV_DEPS})
add_custom_target(luv