diff options
| -rw-r--r-- | third-party/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 3bef4f0faa..8dc9644ae5 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -163,8 +163,8 @@ set(LUAJIT_SHA256 2e3f74bc279f46cc463abfc67b36e69faaf0366237004771f4cac4bf2a9f5e set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz) set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333) -set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v3.2.1.tar.gz) -set(LUAROCKS_SHA256 0cab9f79311083f33e4d8f5a76021604f1d3f7141ce9a2ef1d8b717d92058370) +set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v3.7.0.tar.gz) +set(LUAROCKS_SHA256 968c98ae894cea2c850f077133e3feb9f8ce94df7a33a5611bd4d25e07c94925) set(UNIBILIUM_URL https://github.com/neovim/unibilium/archive/92d929f.tar.gz) set(UNIBILIUM_SHA256 29815283c654277ef77a3adcc8840db79ddbb20a0f0b0c8f648bd8cd49a02e4b) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index a961ec69c7..0cef37736d 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -202,6 +202,11 @@ if(USE_BUNDLED_BUSTED) set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC") if(USE_BUNDLED_LIBUV) list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) + # workaround for bug introduced in + # https://github.com/luarocks/luarocks/commit/83126ba324846b754ffc5e0345341f01262b3f86 + if(MSVC) + list(APPEND LUV_ARGS LIBUV_LIBDIR=${HOSTDEPS_INSTALL_DIR}/lib) + endif() endif() SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3/c-api) add_custom_command(OUTPUT ${ROCKS_DIR}/luv |