File tree Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -50,9 +50,6 @@ endif()
5050# option list
5151#
5252
53- # general
54- option (LLAMA_CCACHE "llama: use ccache if available" ON )
55-
5653# debug
5754option (LLAMA_ALL_WARNINGS "llama: enable all compiler warnings" ON )
5855option (LLAMA_ALL_WARNINGS_3RD_PARTY "llama: enable all compiler warnings in 3rd party libs" OFF )
@@ -77,7 +74,6 @@ option(LLAMA_CURL "llama: use libcurl to download model from an URL" OFF)
7774include (${CMAKE_CURRENT_SOURCE_DIR} /cmake/build -info.cmake)
7875
7976# override ggml options
80- set (GGML_CCACHE ${LLAMA_CCACHE} )
8177set (GGML_SANITIZE_THREAD ${LLAMA_SANITIZE_THREAD} )
8278set (GGML_SANITIZE_ADDRESS ${LLAMA_SANITIZE_ADDRESS} )
8379set (GGML_SANITIZE_UNDEFINED ${LLAMA_SANITIZE_UNDEFINED} )
Original file line number Diff line number Diff line change @@ -245,17 +245,17 @@ MK_CFLAGS = -std=c11 -fPIC
245245MK_CXXFLAGS = -std=c++11 -fPIC
246246MK_NVCCFLAGS = -std=c++11
247247
248- ifndef LLAMA_NO_CCACHE
248+ ifndef GGML_NO_CCACHE
249249CCACHE := $(shell which ccache)
250250ifdef CCACHE
251251export CCACHE_SLOPPINESS = time_macros
252- $(info I ccache found, compilation results will be cached. Disable with LLAMA_NO_CCACHE .)
252+ $(info I ccache found, compilation results will be cached. Disable with GGML_NO_CCACHE .)
253253CC := $(CCACHE ) $(CC )
254254CXX := $(CCACHE ) $(CXX )
255255else
256256$(info I ccache not found. Consider installing it for faster compilation.)
257257endif # CCACHE
258- endif # LLAMA_NO_CCACHE
258+ endif # GGML_NO_CCACHE
259259
260260# clock_gettime came in POSIX.1b (1993)
261261# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
You can’t perform that action at this time.
0 commit comments