diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 21:54:32 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 21:54:32 +1100 |
| commit | 9edcbff46ff01c8d5dee9c1aa843f09e9ad8a80e (patch) | |
| tree | ccddbabe2dca27f6117a170516ba9f02f5aa6b9a | |
| parent | 6d725687c490d4ba957a1bbc0ba0a2956c09fa69 (diff) | |
- (dtucker) [configure.ac] Have --without-toolchain-hardening not turn off
stack-protector since that has a separate flag that's been around a while.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index 4f40afce..f9d87e4b 100644 --- a/configure.ac +++ b/configure.ac @@ -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 ]) |