Skip to content

Commit be54db5

Browse files
committed
Update Makefile to remove unnecessary ggml-blas references and ensure proper linking only for macOS
1 parent a4b107a commit be54db5

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MAKEFLAGS += -j$(CPUS)
2828
CC = gcc
2929
CXX = g++
3030
CFLAGS = -Wall -Wextra -Wno-unused-parameter -I$(SRC_DIR) -I$(LLAMA_DIR)/ggml/include -I$(LLAMA_DIR)/include
31-
LDFLAGS = -L./$(BUILD_DIR)/lib/common -L./$(BUILD_DIR)/lib/ggml/src -L./$(BUILD_DIR)/lib/ggml/src/ggml-blas -L./$(BUILD_DIR)/lib/src -lcommon -lggml -lggml-blas -lggml-base -lggml-cpu -lllama
31+
LDFLAGS = -L./$(BUILD_DIR)/lib/common -L./$(BUILD_DIR)/lib/ggml/src -L./$(BUILD_DIR)/lib/src -lcommon -lggml -lggml-base -lggml-cpu -lllama
3232
LLAMA_OPTIONS = -DLLAMA_CURL=OFF
3333

3434
# Directories
@@ -43,7 +43,6 @@ SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
4343
OBJ_FILES = $(patsubst %.c, $(BUILD_DIR)/%.o, $(notdir $(SRC_FILES)))
4444
LIBS = $(BUILD_DIR)/lib/common/libcommon.a \
4545
$(BUILD_DIR)/lib/ggml/src/libggml.a \
46-
$(BUILD_DIR)/lib/ggml/src/ggml-blas/libggml-blas.a \
4746
$(BUILD_DIR)/lib/ggml/src/libggml-base.a \
4847
$(BUILD_DIR)/lib/ggml/src/libggml-cpu.a \
4948
$(BUILD_DIR)/lib/src/libllama.a
@@ -56,8 +55,8 @@ ifeq ($(PLATFORM),windows)
5655
DEF_FILE := $(BUILD_DIR)/ai.def
5756
else ifeq ($(PLATFORM),macos)
5857
TARGET := $(DIST_DIR)/ai.dylib
59-
LIBS += $(BUILD_DIR)/lib/ggml/src/ggml-metal/libggml-metal.a
60-
LDFLAGS += -arch x86_64 -arch arm64 -L./$(BUILD_DIR)/lib/ggml/src/ggml-metal -lggml-metal -framework Metal -framework Foundation -framework CoreFoundation -framework QuartzCore -framework Accelerate -dynamiclib -undefined dynamic_lookup
58+
LIBS += $(BUILD_DIR)/lib/ggml/src/ggml-metal/libggml-metal.a $(BUILD_DIR)/lib/ggml/src/ggml-blas/libggml-blas.a
59+
LDFLAGS += -arch x86_64 -arch arm64 -L./$(BUILD_DIR)/lib/ggml/src/ggml-metal -lggml-metal -L./$(BUILD_DIR)/lib/ggml/src/ggml-blas -lggml-blas -framework Metal -framework Foundation -framework CoreFoundation -framework QuartzCore -framework Accelerate -dynamiclib -undefined dynamic_lookup
6160
CFLAGS += -arch x86_64 -arch arm64
6261
LLAMA_OPTIONS += -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
6362
else ifeq ($(PLATFORM),android)
@@ -96,7 +95,6 @@ else ifeq ($(PLATFORM),isim)
9695
else # linux
9796
TARGET := $(DIST_DIR)/ai.so
9897
LDFLAGS += -shared
99-
LLAMA_OPTIONS += -DGGML_USE_BLAS=ON
10098
endif
10199

102100
# Windows .def file generation

0 commit comments

Comments
 (0)