From ddf1e86dbcf6a756b215cc219e3b06fee8f59ce9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 5 Feb 2025 21:11:33 +1000 Subject: Fix build for Haiku diff --git a/common/common.cpp b/common/common.cpp index 8661e16..fb9c3c1 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -67,6 +67,8 @@ #if defined(LLAMA_USE_CURL) #ifdef __linux__ #include +#elif defined(__HAIKU__) +#include #elif defined(_WIN32) # if !defined(PATH_MAX) # define PATH_MAX MAX_PATH diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt index 1b7cc8c..cdaded1 100644 --- a/examples/server/CMakeLists.txt +++ b/examples/server/CMakeLists.txt @@ -47,4 +47,8 @@ if (WIN32) TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32) endif() +if (HAIKU) + TARGET_LINK_LIBRARIES(${TARGET} PRIVATE network) +endif() + target_compile_features(${TARGET} PRIVATE cxx_std_17) diff --git a/ggml/src/ggml-rpc/CMakeLists.txt b/ggml/src/ggml-rpc/CMakeLists.txt index f5acb8e..3bb9073 100644 --- a/ggml/src/ggml-rpc/CMakeLists.txt +++ b/ggml/src/ggml-rpc/CMakeLists.txt @@ -7,3 +7,7 @@ ggml_add_backend_library(ggml-rpc if (WIN32) target_link_libraries(ggml-rpc PRIVATE ws2_32) endif() + +if (HAIKU) + target_link_libraries(ggml-rpc PRIVATE network) +endif() diff --git a/src/llama-mmap.cpp b/src/llama-mmap.cpp index b716630..a1b9c7b 100644 --- a/src/llama-mmap.cpp +++ b/src/llama-mmap.cpp @@ -22,6 +22,10 @@ #endif #endif +#ifdef __HAIKU__ +#undef _POSIX_MEMLOCK_RANGE +#endif + #if defined(_WIN32) #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX -- 2.45.2