diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-05-07 17:27:17 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-05-07 17:27:17 -0400 |
| commit | 5add4b1d8349e83eff11743046a0b5d85e51df6c (patch) | |
| tree | bd357193aacd00766845fef412f20148a72d9d00 /configure.in | |
| parent | 6751899fe1c85ad7fdddc9fea74387098ecab015 (diff) | |
| parent | b7e533c1d7f9af334158b324ff61bcdcb3ed2bb7 (diff) | |
| download | tor-5add4b1d8349e83eff11743046a0b5d85e51df6c.tar tor-5add4b1d8349e83eff11743046a0b5d85e51df6c.tar.gz | |
Merge commit 'linus/master'
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 46c3c1944..9dd1ed52f 100644 --- a/configure.in +++ b/configure.in @@ -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, |