diff options
author | 2023-06-23 07:21:11 -0300 | |
---|---|---|
committer | 2023-06-26 10:44:50 -0300 | |
commit | 22031ce6415833dd0f88d1cb748a4a231810ccc0 (patch) | |
tree | ec986cb9f20dee63b7c9ed8012bf11c81ec99c34 /config.mk.in | |
parent | build: move remaining build flags into config.mk.in (diff) | |
download | firejail-22031ce6415833dd0f88d1cb748a4a231810ccc0.tar.gz firejail-22031ce6415833dd0f88d1cb748a4a231810ccc0.tar.zst firejail-22031ce6415833dd0f88d1cb748a4a231810ccc0.zip |
build: standardize common CFLAGS
Changes:
* Deduplicate common CFLAGS into a new COMMON_CFLAGS variable
* Move some definitions from PROG_CFLAGS into COMMON_CFLAGS
Diffstat (limited to 'config.mk.in')
-rw-r--r-- | config.mk.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config.mk.in b/config.mk.in index b32431ad7..89d401dfd 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -82,7 +82,7 @@ LDFLAGS=@LDFLAGS@ | |||
82 | 82 | ||
83 | # Project variables | 83 | # Project variables |
84 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | 84 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ |
85 | PROG_CFLAGS = \ | 85 | COMMON_CFLAGS = \ |
86 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ | 86 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ |
87 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ | 87 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ |
88 | -Wformat -Wformat-security \ | 88 | -Wformat -Wformat-security \ |
@@ -90,15 +90,15 @@ PROG_CFLAGS = \ | |||
90 | -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ | 90 | -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ |
91 | -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ | 91 | -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ |
92 | -DVARDIR='"/var/lib/firejail"' \ | 92 | -DVARDIR='"/var/lib/firejail"' \ |
93 | |||
94 | PROG_CFLAGS = \ | ||
95 | $(COMMON_CFLAGS) \ | ||
93 | $(HAVE_GCOV) $(MANFLAGS) \ | 96 | $(HAVE_GCOV) $(MANFLAGS) \ |
94 | $(EXTRA_CFLAGS) \ | 97 | $(EXTRA_CFLAGS) \ |
95 | -fPIE | 98 | -fPIE |
96 | 99 | ||
97 | SO_CFLAGS = \ | 100 | SO_CFLAGS = \ |
98 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ | 101 | $(COMMON_CFLAGS) \ |
99 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ | ||
100 | -Wformat -Wformat-security \ | ||
101 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ | ||
102 | -fPIC | 102 | -fPIC |
103 | 103 | ||
104 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 104 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |