diff --git a/Makefile.inc b/Makefile.inc
index ec086b90ff..b7c490473d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -395,7 +395,11 @@ CFLAGS_common += -Wno-packed-not-aligned
 CFLAGS_common += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
 CFLAGS_common += -ffunction-sections -fdata-sections -fno-pie
 ifeq ($(CONFIG_COMPILER_GCC),y)
-CFLAGS_common += -fno-delete-null-pointer-checks -fconserve-stack
+CFLAGS_common += -fno-delete-null-pointer-checks
+# Don't add these GCC specific flags when running scan-build
+ifeq ($(CCC_ANALYZER_OUTPUT_FORMAT),)
+CFLAGS_common += -fconserve-stack
+endif
 endif
 
 ADAFLAGS_common += -gnatp