Skip to content

Commit 29bc44b

Browse files
committed
fix(build): correct paths for LLAMA_LIBS and update linker flags for HIP builds
1 parent 3b99fa9 commit 29bc44b

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ifeq ($(USE_MSVC),1)
109109
MINIAUDIO_LIBS = $(BUILD_MINIAUDIO)/Release/miniaudio.lib
110110
else ifeq ($(USE_HIP_CLANG),1)
111111
# HIP builds with MSVC create .lib files in Release/ directories
112-
LLAMA_LIBS = $(BUILD_LLAMA)/common/Release/common.lib $(BUILD_LLAMA)/src/Release/llama.lib $(BUILD_LLAMA)/ggml/src/Release/ggml.lib $(BUILD_LLAMA)/ggml/src/Release/ggml-base.lib
112+
LLAMA_LIBS = $(BUILD_LLAMA)/common/common.lib $(BUILD_LLAMA)/src/llama.lib $(BUILD_LLAMA)/ggml/src/ggml.lib $(BUILD_LLAMA)/ggml/src/ggml-base.lib
113113
WHISPER_LIBS = $(BUILD_WHISPER)/src/Release/whisper.lib
114114
MINIAUDIO_LIBS = $(BUILD_MINIAUDIO)/Release/miniaudio.lib
115115
else
@@ -259,13 +259,13 @@ ifneq (,$(findstring HIP,$(LLAMA)))
259259
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-hip/libggml-hip.a
260260
else
261261
# Windows HIP build - HIP libraries are built as .lib files in Release/ directories
262-
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-hip/Release/ggml-hip.lib
262+
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-hip/ggml-hip.lib
263263
ifeq ($(USE_HIP_CLANG),1)
264264
# HIP Clang linker flags for .lib files
265265
LLAMA_LDFLAGS += -L"$(HIP_PATH)/lib" -lamdhip64 -lrocblas
266266
else
267267
# MinGW linker flags (should not be used for HIP)
268-
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-hip/Release -L"$(HIP_PATH)/lib" -lggml-hip -lamdhip64 -lrocblas
268+
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-hip -L"$(HIP_PATH)/lib" -lggml-hip -lamdhip64 -lrocblas
269269
endif
270270
endif
271271
endif

0 commit comments

Comments
 (0)