diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-10 11:20:46 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-10 11:20:46 -0300 |
| commit | 710af834d62747c15c9f2b129ee83309e18da9f8 (patch) | |
| tree | 9419db512462bfb1d9fa1f93366f8d4fd1206273 | |
| parent | b0044fa5c323d6a0cb43741dfc0bf55ced172404 (diff) | |
| parent | daba57c51236c77e0b53e4028672aee3c2a59c1b (diff) | |
| download | rneovim-710af834d62747c15c9f2b129ee83309e18da9f8.tar.gz rneovim-710af834d62747c15c9f2b129ee83309e18da9f8.tar.bz2 rneovim-710af834d62747c15c9f2b129ee83309e18da9f8.zip | |
Merge PR #1973 'Add Luajit compilation flags to improve debugging'
| -rw-r--r-- | test/functional/helpers.lua | 5 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index e63c79ec80..ea98ff4ce3 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -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') local Loop = require('nvim.loop') local MsgpackStream = require('nvim.msgpack_stream') diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 19fc348c04..46955d5e8f 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -202,6 +202,10 @@ if(USE_BUNDLED_LUAJIT) INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} CFLAGS=-fPIC + CFLAGS+=-DLUAJIT_DISABLE_JIT + CFLAGS+=-DLUA_USE_APICHECK + CFLAGS+=-DLUA_USE_ASSERT + CCDEBUG+=-g BUILDMODE=static install) 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 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) add_custom_target(nvim-client DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client) |