diff options
author | netblue30 <netblue30@yahoo.com> | 2019-07-22 20:01:30 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2019-07-22 20:01:30 -0400 |
commit | 490918c354407a7b3af2d2d1d358bf59132ffe12 (patch) | |
tree | b02d3fab2db3269ab37d6bfdca9262ce6b96b75b | |
parent | fix make cppcheck for debian 10 (diff) | |
download | firejail-490918c354407a7b3af2d2d1d358bf59132ffe12.tar.gz firejail-490918c354407a7b3af2d2d1d358bf59132ffe12.tar.zst firejail-490918c354407a7b3af2d2d1d358bf59132ffe12.zip |
fix make scan-build for debian 10 and arch
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | src/common.mk.in | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 695b11e9c..c6bacff31 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -231,7 +231,7 @@ cppcheck: clean | |||
231 | cppcheck --force --error-exitcode=1 --enable=warning,performance . | 231 | cppcheck --force --error-exitcode=1 --enable=warning,performance . |
232 | 232 | ||
233 | scan-build: clean | 233 | scan-build: clean |
234 | scan-build make | 234 | NO_EXTRA_CFLAGS="yes" scan-build make |
235 | 235 | ||
236 | 236 | ||
237 | # | 237 | # |
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) | |||
32 | 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 | 32 | 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 |
33 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 33 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
34 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 34 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
35 | |||
36 | ifdef NO_EXTRA_CFLAGS | ||
37 | else | ||
35 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | 38 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ |
39 | endif | ||