mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 09:50:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.7' into maint-0.2.8

Browse Source
This commit is contained in:
Nick Mathewson 2016-05-11 12:23:20 -04:00
commit 50249c7cd9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug18841.1 Normal file
View File

@ -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".

2
configure.ac
View File

@ -761,7 +761,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
#endif])], have_clang=yes, have_clang=no) #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) TOR_CHECK_CFLAGS(-Qunused-arguments)
fi fi