diff options
| author |  smitsohu <smitsohu@gmail.com> | 2019-07-25 11:58:53 +0200 |
|---|---|---|
| committer | smitsohu <smitsohu@gmail.com> | 2019-07-25 11:58:53 +0200 |
| commit | d4971ce7f62a9b31a86cb1b056b4f5fc9aa77499 (patch) | |
| tree | d5b602c771940985a9e68f5d5002d0d41b30728d /src | |
| parent | fix whitelisting for homedirs outside /home (diff) | |
| parent | fix make scan-build for debian 10 and arch (diff) | |
| download | firejail-d4971ce7f62a9b31a86cb1b056b4f5fc9aa77499.tar.gz firejail-d4971ce7f62a9b31a86cb1b056b4f5fc9aa77499.tar.zst firejail-d4971ce7f62a9b31a86cb1b056b4f5fc9aa77499.zip | |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.mk.in | 4 |
1 files changed, 4 insertions, 0 deletions
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 | ||