aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--third-party/cmake/BuildLuarocks.cmake12
1 files changed, 9 insertions, 3 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 79d7e83ce7..5910e430b0 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -114,12 +114,18 @@ add_custom_target(lpeg
list(APPEND THIRD_PARTY_DEPS lpeg)
if(USE_BUNDLED_BUSTED)
- add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted
+ # We can remove the cliargs dependency once the busted version dependency
+ # is fixed.
+ add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs
COMMAND ${LUAROCKS_BINARY}
- ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-0/busted-2.0.rc10-0.rockspec ${LUAROCKS_BUILDARGS}
+ ARGS install lua_cliargs 2.5-4
DEPENDS luarocks)
+ add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted
+ COMMAND ${LUAROCKS_BINARY}
+ ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc10-1/busted-2.0.rc10-1.rockspec ${LUAROCKS_BUILDARGS}
+ DEPENDS luarocks ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs)
add_custom_target(busted
- DEPENDS ${HOSTDEPS_BIN_DIR}/busted)
+ DEPENDS ${HOSTDEPS_BIN_DIR}/busted ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs)
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${LUAROCKS_BINARY}