From e34ae35d102d7bad4e4939f7736da84a31302c94 Mon Sep 17 00:00:00 2001
From: John Szakmeister <john@szakmeister.net>
Date: Wed, 28 Oct 2015 03:12:48 -0400
Subject: Remove our cliargs workaround use 2.0.rc11 of Busted.

Busted now correctly excludes the 3.0 line of cliargs.
---
 third-party/cmake/BuildLuarocks.cmake | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 5910e430b0..cb38b3b6cc 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -116,16 +116,12 @@ list(APPEND THIRD_PARTY_DEPS lpeg)
 if(USE_BUNDLED_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 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)
+    ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS}
+    DEPENDS luarocks)
   add_custom_target(busted
-    DEPENDS ${HOSTDEPS_BIN_DIR}/busted ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lua_cliargs)
+    DEPENDS ${HOSTDEPS_BIN_DIR}/busted)
 
   add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
     COMMAND ${LUAROCKS_BINARY}
-- 
cgit