diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-11 12:23:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-11 12:23:20 -0400 |
| commit | 50249c7cd97c982fe829a9e7a22e660658b4e217 (patch) | |
| tree | 736b4454e3476486c5d6987c5c8812a92ab08184 | |
| parent | 5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4 (diff) | |
| parent | 039fc8427a512efce87b7bd21c10c4adca4ba30d (diff) | |
| download | tor-50249c7cd97c982fe829a9e7a22e660658b4e217.tar.gz tor-50249c7cd97c982fe829a9e7a22e660658b4e217.zip | |
Merge branch 'maint-0.2.7' into maint-0.2.8
| -rw-r--r-- | changes/bug18841.1 | 7 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug18841.1 b/changes/bug18841.1 new file mode 100644 index 0000000000..205ee5a425 --- /dev/null +++ b/changes/bug18841.1 @@ -0,0 +1,7 @@ + o Major bugfixes (compilation): + - Correctly detect compiler flags on systems where _FORTIFY_SOURCE + is predefined. Previously, our use of -D_FORTIFY_SOURCE would + cause a compiler warning, thereby making other checks fail. + Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from + "trudokal". + diff --git a/configure.ac b/configure.ac index e4816fdbd7..a487948745 100644 --- a/configure.ac +++ b/configure.ac @@ -761,7 +761,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #endif])], have_clang=yes, have_clang=no) 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 TOR_CHECK_CFLAGS(-Qunused-arguments) fi |