mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 18:55:14 -07:00
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.
This commit is contained in:
parent
6e26964e0e
commit
87db6d894a
@ -31,7 +31,7 @@ if(UNIX)
|
|||||||
|
|
||||||
set(LUAROCKS_CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
|
set(LUAROCKS_CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
|
||||||
--prefix=${DEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS})
|
--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)
|
elseif(MSVC OR MINGW)
|
||||||
if(MINGW)
|
if(MINGW)
|
||||||
set(COMPILER_FLAG /MW)
|
set(COMPILER_FLAG /MW)
|
||||||
|
Loading…
Reference in New Issue
Block a user