diff --git a/Makefile b/Makefile
index 63874fb6de..6224075fb4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,11 @@ LDFLAGS := "-w \
 
 
 #####################################################
-
-GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
+ifneq ($(DLV),)
+	GO_BUILD_FLAGS += -gcflags "all=-N -l"
+	LDFLAGS = "" 
+endif
+GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
 GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test