Skip to content

Commit 82c3d32

Browse files
committed
fix(build): adjust LLAMA library linking for SYCL on Windows
1 parent 2c6fabd commit 82c3d32

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
@@ -44,6 +44,7 @@ ifeq ($(PLATFORM),windows)
4444
endif
4545
ifneq (,$(findstring SYCL,$(LLAMA)))
4646
USE_MSVC = 1
47+
IS_SYCL = 1
4748
endif
4849
# HIP builds use their own Clang compiler, not MSVC
4950
ifneq (,$(findstring HIP,$(LLAMA)))
@@ -112,7 +113,11 @@ LDFLAGS = $(LLAMA_LDFLAGS) $(WHISPER_LDFLAGS) $(MINIAUDIO_LDFLAGS)
112113
SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
113114
OBJ_FILES = $(patsubst %.c, $(BUILD_DIR)/%$(OBJ_EXT), $(notdir $(SRC_FILES)))
114115
ifeq ($(USE_MSVC),1)
115-
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
116+
ifeq ($(IS_SYCL),1)
117+
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
118+
else
119+
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
120+
endif
116121
WHISPER_LIBS = $(BUILD_WHISPER)/src/Release/whisper.lib
117122
MINIAUDIO_LIBS = $(BUILD_MINIAUDIO)/Release/miniaudio.lib
118123
else ifeq ($(USE_HIP_CLANG),1)
@@ -290,14 +295,9 @@ ifneq (,$(findstring SYCL,$(LLAMA)))
290295
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-sycl $(L)ggml-sycl$(A) -lsycl -ldl
291296
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-sycl/libggml-sycl.a
292297
else
293-
# Windows SYCL build - use MSVC linking with .lib files
294-
ifeq ($(USE_MSVC),1)
295-
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-sycl/Release/ggml-sycl.lib
296-
MSVC_LIBS += sycl.lib
297-
else
298-
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-sycl/Release -lggml-sycl -lsycl
299-
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-sycl/Release/ggml-sycl.lib
300-
endif
298+
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-sycl/ggml-sycl.lib
299+
#LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-sycl -lggml-sycl -lsycl
300+
MSVC_LIBS += sycl.lib
301301
endif
302302
endif
303303

0 commit comments

Comments
 (0)