From: Johannes Gäßler <redacted>
Date: Mon, 3 Jun 2024 14:28:58 +0000 (+0200)
Subject: make: fix debug options not being applied to NVCC (#7714)
X-Git-Tag: upstream/0.0.4488~1411
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=0b832d53ba0ffcc759c8d62ede3772dd62321f8e;p=pkg%2Fggml%2Fsources%2Fllama.cpp

make: fix debug options not being applied to NVCC (#7714)
---

diff --git a/Makefile b/Makefile
index c643fe0c..dca2aafd 100644
--- a/Makefile
+++ b/Makefile
@@ -135,12 +135,16 @@ MK_NVCCFLAGS = -std=c++11
 ifdef LLAMA_FAST
 MK_CFLAGS     += -Ofast
 HOST_CXXFLAGS += -Ofast
+ifndef LLAMA_DEBUG
 MK_NVCCFLAGS  += -O3
+endif # LLAMA_DEBUG
 else
 MK_CFLAGS     += -O3
 MK_CXXFLAGS   += -O3
+ifndef LLAMA_DEBUG
 MK_NVCCFLAGS  += -O3
-endif
+endif # LLAMA_DEBUG
+endif # LLAMA_FAST
 
 ifndef LLAMA_NO_CCACHE
 CCACHE := $(shell which ccache)
@@ -201,9 +205,10 @@ ifdef LLAMA_SCHED_MAX_COPIES
 endif
 
 ifdef LLAMA_DEBUG
-	MK_CFLAGS   += -O0 -g
-	MK_CXXFLAGS += -O0 -g
-	MK_LDFLAGS  += -g
+	MK_CFLAGS    += -O0 -g
+	MK_CXXFLAGS  += -O0 -g
+	MK_LDFLAGS   += -g
+	MK_NVCCFLAGS += -O0 -g
 
 	ifeq ($(UNAME_S),Linux)
 		MK_CPPFLAGS += -D_GLIBCXX_ASSERTIONS