diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-11 12:22:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-11 12:22:36 -0400 |
| commit | 039fc8427a512efce87b7bd21c10c4adca4ba30d (patch) | |
| tree | 2b317b911ad917c854f5584c3521b54c3e0e9d90 | |
| parent | 61c0bae4f20556cf155562582ea00a6a147252d6 (diff) | |
| parent | c662bef45595e40106becfbdbb39811300d15a7f (diff) | |
| download | tor-039fc8427a512efce87b7bd21c10c4adca4ba30d.tar.gz tor-039fc8427a512efce87b7bd21c10c4adca4ba30d.zip | |
Merge branch 'bug18841_1_025' into maint-0.2.7
| -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 bf6d7f66ea..8107c905a5 100644 --- a/configure.ac +++ b/configure.ac @@ -718,7 +718,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 |