neovim

commit 87db6d894ad252edf69cd3382704c60d3115b51e
parent 6e26964e0effdb4998fb98bc7f87430ce50cc672
Author: Sergey Slipchenko <faergeek@gmail.com>
Date:   Thu, 31 Aug 2023 09:13:58 +0400

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.

Diffstat:
M
cmake/BuildLuarocks.cmake
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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)