Skip to content

Commit a3822fb

Browse files
committed
update Makefile
1 parent dda8847 commit a3822fb

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

Makefile

+4-17
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ endif # GGML_NVPL
569569

570570
ifndef GGML_NO_LLAMAFILE
571571
MK_CPPFLAGS += -DGGML_USE_TINYBLAS
572-
OBJ_GGML_EXT += ggml/src/ggml-tinyblas/ggml-tinyblas.o ggml/src/ggml-tinyblas/sgemm.o
572+
OBJ_GGML_EXT += ggml/src/ggml-tinyblas/ggml-tinyblas-cpp17.o ggml/src/ggml-tinyblas/sgemm-cpp17.o
573573
endif
574574

575575
ifndef GGML_NO_AMX
@@ -1153,22 +1153,9 @@ $(DIR_GGML)/src/ggml-cpu/ggml-cpu-cpp.o: \
11531153
ggml/src/ggml-impl.h
11541154
$(CXX) $(CXXFLAGS) -c $< -o $@
11551155

1156-
# TODO: renomer en GGML_NO_TINYBLAS
1157-
# needed for c++17 build
1158-
ifndef GGML_NO_LLAMAFILE
1159-
ggml/src/ggml-tinyblas/ggml-tinyblas.o: \
1160-
ggml/src/ggml-tinyblas/ggml-tinyblas.cpp \
1161-
ggml/include/ggml-tinyblas.h \
1162-
ggml/src/ggml-tinyblas/sgemm.h \
1163-
ggml/include/ggml.h
1164-
$(CXX) $(CXXFLAGS) -std=c++17 -c $< -o $@
1165-
1166-
ggml/src/ggml-tinyblas/sgemm.o: \
1167-
ggml/src/ggml-tinyblas/sgemm.cpp \
1168-
ggml/src/ggml-tinyblas/sgemm.h \
1169-
ggml/include/ggml.h
1170-
$(CXX) $(CXXFLAGS) -std=c++17 -c $< -o $@
1171-
endif # GGML_NO_LLAMAFILE
1156+
# for c++17 build
1157+
$(DIR_GGML)/%-cpp17.o: $(DIR_GGML)/%.cpp
1158+
$(CXX) $(CXXFLAGS) -MMD -std=c++17 -c $< -o $@
11721159

11731160
# Rules for building object files
11741161
$(DIR_GGML)/%.o: $(DIR_GGML)/%.c

0 commit comments

Comments
 (0)