mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

third-party: luarocks: Use Lua if LuaJIT is disabled

Browse Source
This commit is contained in:
James McCoy
2018-02-01 09:23:33 -05:00
parent 4487657576
commit 204ec6337e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
third-party/cmake/BuildLua.cmake vendored
View File

@@ -84,14 +84,13 @@ BuildLua(CONFIGURE_COMMAND ${LUA_CONFIGURE_COMMAND}
BUILD_COMMAND ${LUA_BUILD_COMMAND} BUILD_COMMAND ${LUA_BUILD_COMMAND}
INSTALL_COMMAND ${LUA_INSTALL_COMMAND}) INSTALL_COMMAND ${LUA_INSTALL_COMMAND})
list(APPEND THIRD_PARTY_DEPS lua) list(APPEND THIRD_PARTY_DEPS lua)
add_dependencies(lua busted)
set(BUSTED ${DEPS_INSTALL_DIR}/bin/busted) set(BUSTED ${DEPS_INSTALL_DIR}/bin/busted)
set(BUSTED_LUA ${BUSTED}-lua) set(BUSTED_LUA ${BUSTED}-lua)
add_custom_command(OUTPUT ${BUSTED_LUA} add_custom_command(OUTPUT ${BUSTED_LUA}
COMMAND sed -e 's/^exec/exec $$LUA_DEBUGGER/' -e 's/jit//g' < ${BUSTED} > ${BUSTED_LUA} && chmod +x ${BUSTED_LUA} COMMAND sed -e 's/^exec/exec $$LUA_DEBUGGER/' -e 's/jit//g' < ${BUSTED} > ${BUSTED_LUA} && chmod +x ${BUSTED_LUA}
DEPENDS lua) DEPENDS lua busted)
add_custom_target(busted-lua add_custom_target(busted-lua
DEPENDS ${DEPS_INSTALL_DIR}/bin/busted-lua) DEPENDS ${DEPS_INSTALL_DIR}/bin/busted-lua)

9
third-party/cmake/BuildLuarocks.cmake vendored
View File

@@ -56,13 +56,16 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
if(USE_BUNDLED_LUAJIT) if(USE_BUNDLED_LUAJIT)
list(APPEND LUAROCKS_OPTS list(APPEND LUAROCKS_OPTS
--with-lua=${HOSTDEPS_INSTALL_DIR} --with-lua=${HOSTDEPS_INSTALL_DIR}
--with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.0) --with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.0
--lua-suffix=jit)
elseif(USE_BUNDLED_LUA)
list(APPEND LUAROCKS_OPTS
--with-lua=${HOSTDEPS_INSTALL_DIR})
endif() endif()
BuildLuarocks( BuildLuarocks(
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
--prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS} --prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS}
--lua-suffix=jit
INSTALL_COMMAND ${MAKE_PRG} bootstrap) INSTALL_COMMAND ${MAKE_PRG} bootstrap)
elseif(MSVC OR MINGW) elseif(MSVC OR MINGW)
@@ -94,6 +97,8 @@ if(USE_BUNDLED_LUAJIT)
if(MINGW AND CMAKE_CROSSCOMPILING) if(MINGW AND CMAKE_CROSSCOMPILING)
add_dependencies(luarocks luajit_host) add_dependencies(luarocks luajit_host)
endif() endif()
elseif(USE_BUNDLED_LUA)
add_dependencies(luarocks lua)
endif() endif()
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.