diff --git a/make/defs.mk b/make/defs.mk
index 841486b1..7f125b25 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -457,9 +457,14 @@ ifeq ($(USE_MPATROL),true)
 	LDFLAGS     += -lmpatrolmt -lbfd -liberty
 endif
 
+ifeq ($(USE_STACK_CHECK),true)
+	CFLAGS      += -fstack-check
+	CPPFLAGS    += -fstack-check
+endif
+
 ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
-	CFLAGS      += -Wall -g3 -fstack-check -fexceptions
-	CPPFLAGS    += -Wall -g3 -fstack-check
+	CFLAGS      += -Wall -g3 -fexceptions
+	CPPFLAGS    += -Wall -g3
 	LDFLAGS     += -Wall -g3
 endif