mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge commit 'linus/master'

Browse source
This commit is contained in:
Roger Dingledine 2010-05-07 17:27:17 -04:00
commit 5add4b1d83
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.in
View file

@ -98,9 +98,9 @@ AC_ARG_ENABLE(gcc-hardening,
AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks),
[if test x$enableval = xyes; then
CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
CFLAGS+=" -fwrapv -fPIE -Wstack-protector -Wformat -Wformat-security"
CFLAGS+=" -Wpointer-sign"
LDFLAGS+=" -pie"
CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector -Wformat -Wformat-security"
CFLAGS="$CFLAGS -Wpointer-sign"
LDFLAGS="$LDFLAGS -pie"
fi])
dnl Linker hardening options
@ -108,7 +108,7 @@ dnl Currently these options are ELF specific - you can't use this with MacOSX
AC_ARG_ENABLE(linker-hardening,
AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups),
[if test x$enableval = xyes; then
LDFLAGS+=" -z relro -z now"
LDFLAGS="$LDFLAGS -z relro -z now"
fi])
AC_ARG_ENABLE(local-appdata,