Skip to content

Commit e6486eb

Browse files
committed
fix(makefile): mingw use -l:lib.a format only in ggml proprietary libraries
1 parent 9ada475 commit e6486eb

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ else
5151
L = -l
5252
endif
5353
# Module-specific linker flags
54-
LLAMA_LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src $(L)common$(A) $(L)llama$(A) $(L)ggml$(A) $(L)ggml-base$(A) $(L)ggml-cpu$(A)
55-
WHISPER_LDFLAGS = -L./$(BUILD_WHISPER)/src $(L)whisper$(A)
56-
MINIAUDIO_LDFLAGS = -L./$(BUILD_MINIAUDIO) $(L)miniaudio$(A)
54+
LLAMA_LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src -lcommon -lllama $(L)ggml$(A) $(L)ggml-base$(A) $(L)ggml-cpu$(A)
55+
WHISPER_LDFLAGS = -L./$(BUILD_WHISPER)/src -lwhisper
56+
MINIAUDIO_LDFLAGS = -L./$(BUILD_MINIAUDIO) -lminiaudio
5757
LDFLAGS = $(LLAMA_LDFLAGS) $(WHISPER_LDFLAGS) $(MINIAUDIO_LDFLAGS)
5858

5959
# Files
@@ -140,25 +140,25 @@ ifneq (,$(findstring VULKAN,$(LLAMA)))
140140
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-vulkan $(L)ggml-vulkan$(A)
141141
# Add Vulkan SDK library path if available
142142
ifdef VULKAN_SDK
143-
LLAMA_LDFLAGS += -L$(VULKAN_SDK)/lib $(L)vulkan$(A)
143+
LLAMA_LDFLAGS += -L$(VULKAN_SDK)/lib -lvulkan
144144
else # system Vulkan library locations
145-
LLAMA_LDFLAGS += $(L)vulkan$(A) $(L)dl$(A)
145+
LLAMA_LDFLAGS += -lvulkan -ldl
146146
endif
147147
endif
148148
ifneq (,$(findstring OPENCL,$(LLAMA)))
149149
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-opencl/libggml-opencl.a
150-
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-opencl $(L)ggml-opencl$(A) $(L)OpenCL$(A)
150+
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-opencl $(L)ggml-opencl$(A) -lOpenCL
151151
endif
152152
ifneq (,$(findstring BLAS,$(LLAMA)))
153153
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-blas/libggml-blas.a
154-
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-blas$(A) $(L)ggml-blas$(A)
154+
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-blas $(L)ggml-blas$(A)
155155
# Link against specific BLAS implementations
156156
ifneq (,$(findstring OpenBLAS,$(LLAMA)))
157-
LLAMA_LDFLAGS += $(L)openblas$(A)
157+
LLAMA_LDFLAGS += -lopenblas
158158
else ifneq (,$(findstring Apple,$(LLAMA)))
159159
LDFLAGS += -framework Accelerate
160160
else # Generic BLAS
161-
LLAMA_LDFLAGS += $(L)blas$(A)
161+
LLAMA_LDFLAGS += -lblas
162162
endif
163163
endif
164164
ifneq (,$(findstring COREML,$(WHISPER))) # CoreML - only macos

0 commit comments

Comments
 (0)