From c49feb546f5f6d8040c49a610535a85bc2a65714 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 18 Apr 2026 00:42:05 +0200 Subject: [PATCH] fix(llama-cpp): rename linked target common -> llama-common (#9408) Upstream llama.cpp (45cac7ca) renamed the CMake library target `common` to `llama-common`. Linking the old name caused `target_include_directories(... PUBLIC .)` from the common/ dir to not propagate, so `#include "common.h"` failed when building grpc-server. --- backend/cpp/llama-cpp/CMakeLists.txt | 2 +- backend/cpp/llama-cpp/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/cpp/llama-cpp/CMakeLists.txt b/backend/cpp/llama-cpp/CMakeLists.txt index 598461975..9fcdca573 100644 --- a/backend/cpp/llama-cpp/CMakeLists.txt +++ b/backend/cpp/llama-cpp/CMakeLists.txt @@ -62,7 +62,7 @@ add_executable(${TARGET} grpc-server.cpp json.hpp httplib.h) target_include_directories(${TARGET} PRIVATE ../llava) target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR}) -target_link_libraries(${TARGET} PRIVATE common llama mtmd ${CMAKE_THREAD_LIBS_INIT} absl::flags hw_grpc_proto +target_link_libraries(${TARGET} PRIVATE llama-common llama mtmd ${CMAKE_THREAD_LIBS_INIT} absl::flags hw_grpc_proto absl::flags_parse gRPC::${_REFLECTION} gRPC::${_GRPC_GRPCPP} diff --git a/backend/cpp/llama-cpp/Makefile b/backend/cpp/llama-cpp/Makefile index 1e84c7721..afba5ee95 100644 --- a/backend/cpp/llama-cpp/Makefile +++ b/backend/cpp/llama-cpp/Makefile @@ -1,5 +1,5 @@ -LLAMA_VERSION?=4fbdabdc61c04d1262b581e1b8c0c3b119f688ff +LLAMA_VERSION?=45cac7ca703fb9085eae62b9121fca01d20177f6 LLAMA_REPO?=https://github.com/ggerganov/llama.cpp CMAKE_ARGS?=