factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quoting and ensure old_*flags are restored before the 'else'

Browse Source
This commit is contained in:
Brent Cook 2015-01-05 21:21:23 -06:00 committed by Brent Cook
parent 872ecfd856
commit 4b7e78153c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -94,7 +94,7 @@ AC_ARG_ENABLE([hardening],
[Disable options to frustrate memory corruption exploits])], [Disable options to frustrate memory corruption exploits])],
[], [enable_hardening=yes]) [], [enable_hardening=yes])
AC_DEFUN([CHECK_CFLAG], AC_DEFUN([CHECK_CFLAG], [
AC_LANG_ASSERT(C) AC_LANG_ASSERT(C)
AC_MSG_CHECKING([if $saved_CC supports "$1"]) AC_MSG_CHECKING([if $saved_CC supports "$1"])
old_cflags="$CFLAGS" old_cflags="$CFLAGS"
@ -104,13 +104,14 @@ AC_DEFUN([CHECK_CFLAG],
], ],
[printf("Hello")], [printf("Hello")],
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
CFLAGS=$old_cflags
HARDEN_CFLAGS="$HARDEN_CFLAGS $1", HARDEN_CFLAGS="$HARDEN_CFLAGS $1",
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
$2)
CFLAGS=$old_cflags CFLAGS=$old_cflags
) [$2])
])
AC_DEFUN([CHECK_LDFLAG], AC_DEFUN([CHECK_LDFLAG], [
AC_LANG_ASSERT(C) AC_LANG_ASSERT(C)
AC_MSG_CHECKING([if $saved_LD supports "$1"]) AC_MSG_CHECKING([if $saved_LD supports "$1"])
old_ldflags="$LDFLAGS" old_ldflags="$LDFLAGS"
@ -120,11 +121,12 @@ AC_DEFUN([CHECK_LDFLAG],
], ],
[printf("Hello")], [printf("Hello")],
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
LDFLAGS=$old_ldflags
HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1", HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1",
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
$2)
LDFLAGS=$old_ldflags LDFLAGS=$old_ldflags
) [$2])
])
AS_IF([test "x$enable_hardening" == "xyes"], [ AS_IF([test "x$enable_hardening" == "xyes"], [
# Tell GCC to NOT optimize based on signed arithmetic overflow # Tell GCC to NOT optimize based on signed arithmetic overflow