Skip to content

Commit 4d93a56

Browse files
danbevMinh141120
authored andcommitted
make : remove make in favor of CMake (ggml-org#15449)
This commit removes the content from the Makefile and updates the current deprecation message to information that `make` has been replaced by CMake instead. The message when `make` is invoked will now be the following: ```console $ make Makefile:6: *** Build system changed: The Makefile build has been replaced by CMake. For build instructions see: https://github.com/ggml-org/llama.cpp/blob/master/docs/build.md . Stop. ``` The motivation for this is that many, if not all targets fail to build now, after changes to the system, and `make` has also been deprected for some time now.
1 parent a459ddc commit 4d93a56

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
# Makefile for Cortex llamacpp engine - Build, Lint, Test, and Clean
23

34
CMAKE_EXTRA_FLAGS ?= ""
@@ -74,4 +75,15 @@ else ifeq ($(shell uname -s),Linux)
7475
@tar -czvf llama.tar.gz build/bin;
7576
else
7677
@tar -czvf llama.tar.gz build/bin;
77-
endif
78+
endif
79+
=======
80+
define newline
81+
82+
83+
endef
84+
85+
$(error Build system changed:$(newline)\
86+
The Makefile build has been replaced by CMake.$(newline)$(newline)\
87+
For build instructions see:$(newline)\
88+
https://github.com/ggml-org/llama.cpp/blob/master/docs/build.md$(newline)${newline})
89+
>>>>>>> 37f10f95 (make : remove make in favor of CMake (#15449))

0 commit comments

Comments
 (0)