diff options
| author |  netblue30 <netblue30@yahoo.com> | 2020-04-02 06:14:39 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-04-02 06:14:39 -0500 |
| commit | dcfe4a1a9aed48459410d15a6334415901e56bdd (patch) | |
| tree | 3cf7b052ca5bf68566643c9d300eda7bce8ecc24 | |
| parent | Add 'ignore nodbus', remove 'private-tmp' (diff) | |
| parent | Preserve CFLAGS given to configure in common.mk.in (diff) | |
| download | firejail-dcfe4a1a9aed48459410d15a6334415901e56bdd.tar.gz firejail-dcfe4a1a9aed48459410d15a6334415901e56bdd.tar.zst firejail-dcfe4a1a9aed48459410d15a6334415901e56bdd.zip | |
Merge pull request #3310 from Liorst4/ac-preserve-cflags
Preserve CFLAGS given to configure in common.mk.in
| -rw-r--r-- | src/common.mk.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common.mk.in b/src/common.mk.in index 945815a40..8104bc258 100644 --- a/src/common.mk.in +++ b/src/common.mk.in | |||
| @@ -31,6 +31,7 @@ C_FILE_LIST = $(sort $(wildcard *.c)) | |||
| 31 | OBJS = $(C_FILE_LIST:.c=.o) | 31 | OBJS = $(C_FILE_LIST:.c=.o) |
| 32 | BINOBJS = $(foreach file, $(OBJS), $file) | 32 | BINOBJS = $(foreach file, $(OBJS), $file) |
| 33 | 33 | ||
| 34 | CFLAGS = @CFLAGS@ | ||
| 34 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) | 35 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) |
| 35 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' | 36 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' |
| 36 | CFLAGS += $(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) $(HAVE_SELINUX) | 37 | CFLAGS += $(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) $(HAVE_SELINUX) |