diff options
author | netblue30 <netblue30@protonmail.com> | 2023-05-31 17:49:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-31 17:49:32 -0400 |
commit | 30ff544b8fc4362d51d10d28d633600d5e714ae4 (patch) | |
tree | b36bc36d641e5b3d6b945219ceac0d7dc0d43cd9 | |
parent | build(deps): bump github/codeql-action from 2.3.3 to 2.3.5 (diff) | |
parent | build: enable compiler warnings by default (diff) | |
download | firejail-30ff544b8fc4362d51d10d28d633600d5e714ae4.tar.gz firejail-30ff544b8fc4362d51d10d28d633600d5e714ae4.tar.zst firejail-30ff544b8fc4362d51d10d28d633600d5e714ae4.zip |
Merge pull request #5842 from kmk3/build-enable-warnings
build: enable compiler warnings by default
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/prog.mk | 6 | ||||
-rw-r--r-- | src/so.mk | 6 |
4 files changed, 12 insertions, 8 deletions
@@ -1391,7 +1391,7 @@ Optional Features: | |||
1391 | --disable-x11 disable X11 sandboxing support | 1391 | --disable-x11 disable X11 sandboxing support |
1392 | --disable-file-transfer disable file transfer | 1392 | --disable-file-transfer disable file transfer |
1393 | --disable-suid install as a non-SUID executable | 1393 | --disable-suid install as a non-SUID executable |
1394 | --enable-fatal-warnings -W -Wall -Werror | 1394 | --enable-fatal-warnings -W -Werror |
1395 | --enable-busybox-workaround | 1395 | --enable-busybox-workaround |
1396 | enable busybox workaround | 1396 | enable busybox workaround |
1397 | --enable-gcov Gcov instrumentation | 1397 | --enable-gcov Gcov instrumentation |
@@ -3601,7 +3601,7 @@ fi | |||
3601 | 3601 | ||
3602 | if test "x$enable_fatal_warnings" = "xyes"; then : | 3602 | if test "x$enable_fatal_warnings" = "xyes"; then : |
3603 | 3603 | ||
3604 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | 3604 | HAVE_FATAL_WARNINGS="-W -Werror" |
3605 | 3605 | ||
3606 | fi | 3606 | fi |
3607 | 3607 | ||
diff --git a/configure.ac b/configure.ac index 357d1da45..30b031801 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -215,9 +215,9 @@ AS_IF([test "x$enable_suid" != "xno"], [ | |||
215 | HAVE_FATAL_WARNINGS="" | 215 | HAVE_FATAL_WARNINGS="" |
216 | AC_SUBST([HAVE_FATAL_WARNINGS]) | 216 | AC_SUBST([HAVE_FATAL_WARNINGS]) |
217 | AC_ARG_ENABLE([fatal_warnings], | 217 | AC_ARG_ENABLE([fatal_warnings], |
218 | [AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])]) | 218 | [AS_HELP_STRING([--enable-fatal-warnings], [-W -Werror])]) |
219 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ | 219 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ |
220 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | 220 | HAVE_FATAL_WARNINGS="-W -Werror" |
221 | ]) | 221 | ]) |
222 | 222 | ||
223 | BUSYBOX_WORKAROUND="no" | 223 | BUSYBOX_WORKAROUND="no" |
diff --git a/src/prog.mk b/src/prog.mk index b2ccf6147..e4473184f 100644 --- a/src/prog.mk +++ b/src/prog.mk | |||
@@ -10,8 +10,10 @@ SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | |||
10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | 10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) |
11 | 11 | ||
12 | PROG_CFLAGS = \ | 12 | PROG_CFLAGS = \ |
13 | -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' \ | 13 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ |
14 | -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ | 14 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ |
15 | -Wformat -Wformat-security \ | ||
16 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ | ||
15 | -fPIE \ | 17 | -fPIE \ |
16 | -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ | 18 | -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ |
17 | -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ | 19 | -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ |
@@ -10,8 +10,10 @@ SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | |||
10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | 10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) |
11 | 11 | ||
12 | SO_CFLAGS = \ | 12 | SO_CFLAGS = \ |
13 | -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' \ | 13 | -ggdb -O2 -DVERSION='"$(VERSION)"' \ |
14 | -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ | 14 | -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ |
15 | -Wformat -Wformat-security \ | ||
16 | -fstack-protector-all -D_FORTIFY_SOURCE=2 \ | ||
15 | -fPIC | 17 | -fPIC |
16 | 18 | ||
17 | SO_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now | 19 | SO_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now |