configure.ac: Cleanup hardening flags.

diff --git a/configure.ac b/configure.ac
index db5285cd99db5333e7a100e57f9d5fd4613b8c4d..e2f54801c5cd1efa769e038dd1edc30a1e4a8bc4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,10 @@ if test "x$GCC" = xyes; then
     CFLAGS="-std=c89 -pedantic -Wall -Wextra -Werror $CFLAGS"
     CFLAGS="-Wno-error=int-to-pointer-cast $CFLAGS"
     CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
-    # Additional security flags.
-    CFLAGS="$CFLAGS -Wformat -Wformat-security -Werror=format-security"
-    CFLAGS="$CFLAGS -fstack-protector-all -Wstack-protector"
-    CFLAGS="$CFLAGS --param ssp-buffer-size=1"
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fPIE"
-    LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now -fPIE -pie"
+    # Additional hardening flags.
+    CFLAGS="-fPIE -fstack-protector-all --param=ssp-buffer-size=1 -Wformat -Werror=format-security $CFLAGS"
+    CPPFLAGS="-D_FORTIFY_SOURCE=2 $CPPFLAGS"
+    LDFLAGS="-fPIE -pie -Wl,-z,relro -Wl,-z,now $LDFLAGS"
 fi
 
 AC_CHECK_LIB([pthread], [pthread_create],