From 490918c354407a7b3af2d2d1d358bf59132ffe12 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Mon, 22 Jul 2019 20:01:30 -0400
Subject: fix make scan-build for debian 10 and arch

---
 Makefile.in      | 2 +-
 src/common.mk.in | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 695b11e9c..c6bacff31 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -231,7 +231,7 @@ cppcheck: clean
 	cppcheck --force --error-exitcode=1 --enable=warning,performance .
 
 scan-build: clean
-	scan-build make
+	NO_EXTRA_CFLAGS="yes" scan-build make
 
 
 #
diff --git a/src/common.mk.in b/src/common.mk.in
index 1b6ad91a5..ff66c6748 100644
--- a/src/common.mk.in
+++ b/src/common.mk.in
@@ -32,4 +32,8 @@ BINOBJS =  $(foreach file, $(OBJS), $file)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_FIRETUNNEL) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
 LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread
 EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
+
+ifdef NO_EXTRA_CFLAGS
+else
 EXTRA_CFLAGS +=@EXTRA_CFLAGS@
+endif
-- 
cgit v1.2.3-54-g00ecf