aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Slipchenko <faergeek@gmail.com>2023-08-31 09:13:58 +0400
committerdundargoc <33953936+dundargoc@users.noreply.github.com>2023-09-09 18:41:36 +0200
commit87db6d894ad252edf69cd3382704c60d3115b51e (patch)
tree34cbc56a9624ae066dbf0b8aecce3ed66dfe55b6
parent6e26964e0effdb4998fb98bc7f87430ce50cc672 (diff)
downloadrneovim-87db6d894ad252edf69cd3382704c60d3115b51e.tar.gz
rneovim-87db6d894ad252edf69cd3382704c60d3115b51e.tar.bz2
rneovim-87db6d894ad252edf69cd3382704c60d3115b51e.zip
fix(deps): make sure --force-config takes effect
Fixes #24881 --force-config passed to luarocks' configure script is only taken into account in case "make install" is used afterwards. But if "make bootstrap" is used then this flag has no effect. And it can actually copy an existing config on the system to the new installation. That existing config can have a different version of Lua set by default. In which case luarocks will install packages for that version instead of the one used in tests. And trying to run tests then will fail because of missing packages.
-rw-r--r--cmake/BuildLuarocks.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/BuildLuarocks.cmake b/cmake/BuildLuarocks.cmake
index 2dc493a59b..57d2666d36 100644
--- a/cmake/BuildLuarocks.cmake
+++ b/cmake/BuildLuarocks.cmake
@@ -31,7 +31,7 @@ if(UNIX)
set(LUAROCKS_CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
--prefix=${DEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS})
- set(LUAROCKS_INSTALL_COMMAND ${MAKE_PRG} -j1 bootstrap)
+ set(LUAROCKS_INSTALL_COMMAND ${MAKE_PRG} -j1 install)
elseif(MSVC OR MINGW)
if(MINGW)
set(COMPILER_FLAG /MW)