diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-22 03:43:31 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-06-22 03:43:31 +0200 |
| commit | 058a8ed6ec399d8f1be3d31d7b7a9af24cae0327 (patch) | |
| tree | 28dc2e01b31e3da743073dbdecf11e10c359e85f | |
| parent | aa090f98015c94bf7c3fa43726f2d18fac2ae085 (diff) | |
| download | rneovim-058a8ed6ec399d8f1be3d31d7b7a9af24cae0327.tar.gz rneovim-058a8ed6ec399d8f1be3d31d7b7a9af24cae0327.tar.bz2 rneovim-058a8ed6ec399d8f1be3d31d7b7a9af24cae0327.zip | |
build: USE_BUNDLED_LUV=0 with USE_BUNDLED_LUAROCKS=1 #10291
Fixes https://github.com/neovim/neovim/issues/10289
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 3ef7c6300e..bebfc83bfe 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -181,30 +181,36 @@ if(USE_BUNDLED_BUSTED) DEPENDS busted) add_custom_target(luacheck DEPENDS ${LUACHECK_EXE}) - - set(LUV_DEPS luacheck luv-static lua-compat-5.3) - if(MINGW AND CMAKE_CROSSCOMPILING) - set(LUV_DEPS ${LUV_DEPS} libuv_host) - endif() - set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC") - if(USE_BUNDLED_LIBUV) - list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) + set(nvim_client_depends luacheck) + + if(USE_BUNDLED_LUV) + set(LUV_DEPS luacheck luv-static lua-compat-5.3) + if(MINGW AND CMAKE_CROSSCOMPILING) + set(LUV_DEPS ${LUV_DEPS} libuv_host) + endif() + set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC") + if(USE_BUNDLED_LIBUV) + list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) + endif() + # DEPENDS on the previous module, because Luarocks breaks if parallel. + SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3) + add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv + COMMAND ${LUAROCKS_BINARY} + ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS} + WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv + DEPENDS ${LUV_DEPS}) + add_custom_target(luv + DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv) + set(nvim_client_depends luv) + else() + set(nvim_client_depends luacheck) endif() - # DEPENDS on the previous module, because Luarocks breaks if parallel. - SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3) - add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv - COMMAND ${LUAROCKS_BINARY} - ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS} - WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv - DEPENDS ${LUV_DEPS}) - add_custom_target(luv - DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv) # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client COMMAND ${LUAROCKS_BINARY} ARGS build nvim-client 0.2.0-1 ${LUAROCKS_BUILDARGS} - DEPENDS luv) + DEPENDS ${nvim_client_depends}) add_custom_target(nvim-client DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client) |