diff options
| -rw-r--r-- | test/functional/helpers.lua | 5 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 5 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..6b9cf565b2 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) |