mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-03 15:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1973 'Add Luajit compilation flags to improve debugging'

Browse Source
This commit is contained in:
Thiago de Arruda
2015-02-10 11:20:46 -03:00
parent b0044fa5c3 daba57c512
commit 710af834d6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/functional/helpers.lua
View File

@@ -1,8 +1,3 @@
if jit then
-- Disable JIT because of random errors on Travis with OS X.
jit.off(true, true)
end
require('coxpcall') require('coxpcall')
local Loop = require('nvim.loop') local Loop = require('nvim.loop')
local MsgpackStream = require('nvim.msgpack_stream') local MsgpackStream = require('nvim.msgpack_stream')

6
third-party/CMakeLists.txt vendored
View File

@@ -202,6 +202,10 @@ if(USE_BUNDLED_LUAJIT)
INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
PREFIX=${DEPS_INSTALL_DIR} PREFIX=${DEPS_INSTALL_DIR}
CFLAGS=-fPIC CFLAGS=-fPIC
CFLAGS+=-DLUAJIT_DISABLE_JIT
CFLAGS+=-DLUA_USE_APICHECK
CFLAGS+=-DLUA_USE_ASSERT
CCDEBUG+=-g
BUILDMODE=static BUILDMODE=static
install) install)
list(APPEND THIRD_PARTY_DEPS luajit) list(APPEND THIRD_PARTY_DEPS luajit)
@@ -263,7 +267,7 @@ if(USE_BUNDLED_LUAROCKS)
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${DEPS_BIN_DIR}/luarocks COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build https://raw.githubusercontent.com/neovim/lua-client/af161f5f89c7877d0f650b5de6b3a6126b38f012/nvim-client-0.0.1-10.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR} ARGS build https://raw.githubusercontent.com/neovim/lua-client/fabecc56a7c7a3fc15fe6a1a765b58d61bc8e922/nvim-client-0.0.1-11.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR}
DEPENDS lpeg libuv) DEPENDS lpeg libuv)
add_custom_target(nvim-client add_custom_target(nvim-client
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client)