[or-cvs] [tor/master] Don't be bashistic.

[arma at torproject.org]

Author: Linus Nordberg <linus at nordberg.se>
Date: Fri, 7 May 2010 23:10:30 +0200
Subject: Don't be bashistic.
Commit: b7e533c1d7f9af334158b324ff61bcdcb3ed2bb7

---
 configure.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 07b3ff4..dea2b5f 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,
-- 
1.6.5