Merge commit 'linus/master'

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,