From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 16:23:20 +0000 (-0400)
Subject: Merge branch 'maint-0.2.7' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50249c7cd97c982fe829a9e7a22e660658b4e217;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7' into maint-0.2.8
---

50249c7cd97c982fe829a9e7a22e660658b4e217
diff --cc configure.ac
index e4816fdbd7,8107c905a5..a487948745
--- a/configure.ac
+++ b/configure.ac
@@@ -760,9 -717,9 +760,9 @@@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], 
  #error
  #endif])], have_clang=yes, have_clang=no)
  
 -if test x$enable_gcc_hardening != xno; then
 +if test "x$enable_gcc_hardening" != "xno"; then
-     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+     CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 -    if test x$have_clang = xyes; then
 +    if test "x$have_clang" = "xyes"; then
          TOR_CHECK_CFLAGS(-Qunused-arguments)
      fi
      TOR_CHECK_CFLAGS(-fstack-protector-all, also_link)