diff options
| author | Utkarsh Anand <uanand009@gmail.com> | 2018-04-02 14:38:11 +0530 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-04-02 11:08:11 +0200 |
| commit | 9b7ce004867e0ac3692afbef0cc15e2474242057 (patch) | |
| tree | a43469e71f9b0b9ebfeb070df7044b4961d2249f | |
| parent | 98e71123900fbdf26a16a43297a1f58118cde41b (diff) | |
| download | rneovim-9b7ce004867e0ac3692afbef0cc15e2474242057.tar.gz rneovim-9b7ce004867e0ac3692afbef0cc15e2474242057.tar.bz2 rneovim-9b7ce004867e0ac3692afbef0cc15e2474242057.zip | |
build/OpenBSD: need -lpthread -lc++abi for LuaJIT (#8215)
| -rw-r--r-- | src/nvim/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/nvim/os/process.c | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuajit.cmake | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 606baff619..2728ae9b06 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -359,6 +359,10 @@ endforeach() # Our dependencies come first. +if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") + list(APPEND NVIM_LINK_LIBRARIES pthread c++abi) +endif() + if (LibIntl_FOUND) list(APPEND NVIM_LINK_LIBRARIES ${LibIntl_LIBRARY}) endif() diff --git a/src/nvim/os/process.c b/src/nvim/os/process.c index 63eea9022b..a67e7487eb 100644 --- a/src/nvim/os/process.c +++ b/src/nvim/os/process.c @@ -18,7 +18,7 @@ # include <sys/user.h> #endif -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) # include <sys/param.h> #endif diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index e65a81bba5..2fda221b12 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -35,10 +35,16 @@ function(BuildLuajit) INSTALL_COMMAND "${_luajit_INSTALL_COMMAND}") endfunction() +if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") + set(AMD64_ABI "LDFLAGS=-lpthread -lc++abi") +else() + set(AMD64_ABI "") +endif() set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC CFLAGS+=-DLUAJIT_DISABLE_JIT CFLAGS+=-DLUA_USE_APICHECK CFLAGS+=-DLUA_USE_ASSERT + ${AMD64_ABI} CCDEBUG+=-g Q= install) |