Skip to content

Commit cac28a0

Browse files
committed
fix(makefile): add missing ggml-cpu library to LLAMA linker flags
1 parent 1cf1b2d commit cac28a0

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ LLAMA_OPTIONS = $(LLAMA) -DBUILD_SHARED_LIBS=OFF -DLLAMA_CURL=OFF -DLLAMA_BUILD_
4444
WHISPER_OPTIONS = $(WHISPER) -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_EXAMPLES=OFF -DWHISPER_BUILD_TESTS=OFF -DWHISPER_BUILD_SERVER=OFF -DWHISPER_RPC=OFF
4545
MINIAUDIO_OPTIONS = $(MINIAUDIO) -DBUILD_SHARED_LIBS=OFF -DMINIAUDIO_BUILD_EXAMPLES=OFF -DMINIAUDIO_BUILD_TESTS=OFF
4646
# Module-specific linker flags
47-
LLAMA_LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src -lcommon -lllama -lggml -lggml-base
47+
LLAMA_LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src -lcommon -lllama -lggml -lggml-base -lggml-cpu
4848
WHISPER_LDFLAGS = -L./$(BUILD_WHISPER)/src -lwhisper
4949
MINIAUDIO_LDFLAGS = -L./$(BUILD_MINIAUDIO) -lminiaudio
5050
LDFLAGS = $(LLAMA_LDFLAGS) $(WHISPER_LDFLAGS) $(MINIAUDIO_LDFLAGS)
5151

5252
# Files
5353
SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
5454
OBJ_FILES = $(patsubst %.c, $(BUILD_DIR)/%.o, $(notdir $(SRC_FILES)))
55-
LLAMA_LIBS = $(BUILD_LLAMA)/common/libcommon.a $(BUILD_LLAMA)/ggml/src/libggml.a $(BUILD_LLAMA)/ggml/src/libggml-base.a $(BUILD_LLAMA)/src/libllama.a
55+
LLAMA_LIBS = $(BUILD_LLAMA)/common/libcommon.a $(BUILD_LLAMA)/ggml/src/libggml.a $(BUILD_LLAMA)/ggml/src/libggml-base.a $(BUILD_LLAMA)/ggml/src/libggml-cpu.a $(BUILD_LLAMA)/src/libllama.a
5656
WHISPER_LIBS = $(BUILD_WHISPER)/src/libwhisper.a
5757
MINIAUDIO_LIBS = $(BUILD_MINIAUDIO)/libminiaudio.a
5858

@@ -138,9 +138,6 @@ ifneq (,$(findstring VULKAN,$(LLAMA)))
138138
else
139139
LLAMA_LDFLAGS += -ldl
140140
endif
141-
else # CPU
142-
LLAMA_LDFLAGS += -lggml-cpu
143-
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/libggml-cpu.a
144141
endif
145142

146143
# Windows .def file generation

0 commit comments

Comments
 (0)