- (dtucker) [configure.ac] Have --without-toolchain-hardening not turn off

stack-protector since that has a separate flag that's been around a while.
This commit is contained in:
Darren Tucker 2014-01-17 21:54:32 +11:00
parent 6d725687c4
commit 9edcbff46f
2 changed files with 4 additions and 3 deletions

View File

@ -39,6 +39,8 @@
- (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
need them to cut down on the name collisions.
- (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.
- (dtucker) [configure.ac] Have --without-hardening not turn off
stack-protector since that has a separate flag that's been around a while.
20140118
- (djm) OpenBSD CVS Sync

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.553 2014/01/17 08:17:35 dtucker Exp $
# $Id: configure.ac,v 1.554 2014/01/17 10:54:32 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.553 $)
AC_REVISION($Revision: 1.554 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@ -134,7 +134,6 @@ AC_ARG_WITH([stackprotect],
AC_ARG_WITH([hardening],
[ --without-hardening Don't use toolchain hardening flags], [
if test "x$withval" = "xno"; then
use_stack_protector=0
use_toolchain_hardening=0
fi ])