WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CFLAGS 

1. In harden_cc_flags, put all the flags into AM_CFLAGS.
2. Move the autoconf set -D flags to AM_CPPFLAGS.
pull/86/head
John Safranek 2018-08-06 11:02:00 -07:00
parent 8a010c168e
commit 559f8252fb
2 changed files with 53 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -38,9 +38,7 @@ LT_PREREQ([2.2])
LT_INIT([disable-static win32-dll]) LT_INIT([disable-static win32-dll])
gl_VISIBILITY gl_VISIBILITY
AS_IF([test -n "$CFLAG_VISIBILITY"], AS_IF([test -n "$CFLAG_VISIBILITY"],[AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"])
[AM_CPPFLAGS="$AM_CPPFLAGS $CFLAG_VISIBILITY"
CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"])
# silent # silent
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -74,7 +72,7 @@ AS_IF([test "x$ax_enable_debug" = "xyes"],
[AM_CFLAGS="$DEBUG_CFLAGS $AM_CFLAGS" [AM_CFLAGS="$DEBUG_CFLAGS $AM_CFLAGS"
AM_CPPFLAGS="$DEBUG_CPPFLAGS $AM_CPPFLAGS"], AM_CPPFLAGS="$DEBUG_CPPFLAGS $AM_CPPFLAGS"],
[AM_CFLAGS="$AM_CFLAGS -O2" [AM_CFLAGS="$AM_CFLAGS -O2"
AM_CPPFLAGS="-DNDEBUG $AM_CFLAGS"]) AM_CPPFLAGS="-DNDEBUG $AM_CPPFLAGS"])
AX_PTHREAD([ AX_PTHREAD([
# If AX_PTHREAD is adding -Qunused-arguments, need to prepend with # If AX_PTHREAD is adding -Qunused-arguments, need to prepend with
@ -91,7 +89,7 @@ AC_ARG_ENABLE([inline],
if test "$ENABLED_INLINE" = "no" if test "$ENABLED_INLINE" = "no"
then then
AM_CFLAGS="$AM_CFLAGS -DNO_INLINE" AM_CPPFLAGS="$AM_CPPFLAGS -DNO_INLINE"
fi fi
AM_CONDITIONAL([BUILD_INLINE], [test "x$ENABLED_INLINE" = "xyes"]) AM_CONDITIONAL([BUILD_INLINE], [test "x$ENABLED_INLINE" = "xyes"])
@ -102,7 +100,7 @@ AC_ARG_ENABLE([keygen],
[ENABLED_KEYGEN=$enableval],[ENABLED_KEYGEN=no]) [ENABLED_KEYGEN=$enableval],[ENABLED_KEYGEN=no])
AS_IF([test "x$ENABLED_KEYGEN" = "xyes"], AS_IF([test "x$ENABLED_KEYGEN" = "xyes"],
[AM_CFLAGS="$AM_CFLAGS -DWOLFSSH_KEYGEN"]) [AM_CPPFLAGS="$AM_CPPFLAGS -DWOLFSSH_KEYGEN"])
AM_CONDITIONAL([BUILD_KEYGEN], [test "x$ENABLED_KEYGEN" = "xyes"]) AM_CONDITIONAL([BUILD_KEYGEN], [test "x$ENABLED_KEYGEN" = "xyes"])
@ -112,7 +110,7 @@ AC_ARG_ENABLE([scp],
[ENABLED_SCP=$enableval],[ENABLED_SCP=no]) [ENABLED_SCP=$enableval],[ENABLED_SCP=no])
AS_IF([test "x$ENABLED_SCP" = "xyes"], AS_IF([test "x$ENABLED_SCP" = "xyes"],
[AM_CFLAGS="$AM_CFLAGS -DWOLFSSH_SCP"]) [AM_CPPFLAGS="$AM_CPPFLAGS -DWOLFSSH_SCP"])
AM_CONDITIONAL([BUILD_SCP], [test "x$ENABLED_SCP" = "xyes"]) AM_CONDITIONAL([BUILD_SCP], [test "x$ENABLED_SCP" = "xyes"])
@ -122,7 +120,7 @@ AC_ARG_ENABLE([sftp],
[ENABLED_SFTP=$enableval],[ENABLED_SFTP=no]) [ENABLED_SFTP=$enableval],[ENABLED_SFTP=no])
AS_IF([test "x$ENABLED_SFTP" = "xyes"], AS_IF([test "x$ENABLED_SFTP" = "xyes"],
[AM_CFLAGS="$AM_CFLAGS -DWOLFSSH_SFTP"]) [AM_CPPFLAGS="$AM_CPPFLAGS -DWOLFSSH_SFTP"])
AM_CONDITIONAL([BUILD_SFTP], [test "x$ENABLED_SFTP" = "xyes"]) AM_CONDITIONAL([BUILD_SFTP], [test "x$ENABLED_SFTP" = "xyes"])

94
m4/ax_harden_compiler_flags.m4
View File

@ -100,61 +100,57 @@
ac_cv_warnings_as_errors=no ac_cv_warnings_as_errors=no
ax_append_compile_cflags_extra= ax_append_compile_cflags_extra=
AS_IF([test "$ac_cv_vcs_checkout" = "yes"],[
AX_APPEND_COMPILE_FLAGS([-Werror])
ac_cv_warnings_as_errors=yes
],[
AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cflags_extra])
]) AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],
[AX_APPEND_COMPILE_FLAGS([-Werror],[AM_CFLAGS])
ac_cv_warnings_as_errors="yes"])
AS_IF([test "$ax_enable_debug" = "yes"], [ AS_IF([test "$ax_enable_debug" = "yes"],
AX_APPEND_COMPILE_FLAGS([-g]) [AX_APPEND_COMPILE_FLAGS([-g],[AM_CFLAGS])
AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-ggdb],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-O0],[AM_CFLAGS],[$ax_append_compile_cflags_extra])])
],[])
AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wall],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wall],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wextra],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wextra],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
dnl Anything below this comment please keep sorted. dnl Anything below this comment please keep sorted.
AS_IF([test "$CC" = "clang"],[],[ AS_IF([test "x$CC" != "xclang"],
AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],,[$ax_append_compile_cflags_extra]) [AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],[AM_CFLAGS],[$ax_append_compile_cflags_extra])])
]) AX_APPEND_COMPILE_FLAGS([-Waddress],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Waddress],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Warray-bounds],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Warray-bounds],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast],,[$ax_append_compile_cflags_extra])
dnl Not in use -Wc++-compat dnl Not in use -Wc++-compat
AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wcomment],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wcomment],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat-security],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wformat-security],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat=2],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wformat=2],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnested-externs],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wnested-externs],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Woverride-init],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Woverride-init],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshadow],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wsign-compare],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wundef],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunused],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunused-result],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunused-variable],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-fwrapv],,[$ax_append_compile_cflags_extra]) AX_APPEND_COMPILE_FLAGS([-fwrapv],[AM_CFLAGS],[$ax_append_compile_cflags_extra])
AC_LANG_POP AC_LANG_POP
]) ])