Skip to content

Commit c49feb5

Browse files
authored
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.
1 parent 844b0b7 commit c49feb5

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

backend/cpp/llama-cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ add_executable(${TARGET} grpc-server.cpp json.hpp httplib.h)
6262
target_include_directories(${TARGET} PRIVATE ../llava)
6363
target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR})
6464

65-
target_link_libraries(${TARGET} PRIVATE common llama mtmd ${CMAKE_THREAD_LIBS_INIT} absl::flags hw_grpc_proto
65+
target_link_libraries(${TARGET} PRIVATE llama-common llama mtmd ${CMAKE_THREAD_LIBS_INIT} absl::flags hw_grpc_proto
6666
absl::flags_parse
6767
gRPC::${_REFLECTION}
6868
gRPC::${_GRPC_GRPCPP}

backend/cpp/llama-cpp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
LLAMA_VERSION?=4fbdabdc61c04d1262b581e1b8c0c3b119f688ff
2+
LLAMA_VERSION?=45cac7ca703fb9085eae62b9121fca01d20177f6
33
LLAMA_REPO?=https://github.com/ggerganov/llama.cpp
44

55
CMAKE_ARGS?=

0 commit comments

Comments
 (0)