[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1912-g3ff4d1e

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  3ff4d1eaa3556dfaa41c218a6f7c2872f2323abc (commit)
       via  d23b872316b45cbaf6bbcbd23066a643721f151d (commit)
      from  0ee25be6109c17200183eeca5bc51edd5b8d260b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=3ff4d1eaa3556dfaa41c218a6f7c2872f2323abc


commit 3ff4d1eaa3556dfaa41c218a6f7c2872f2323abc
Merge: d23b872 0ee25be
Author: Markus Gothe <address@hidden>
Date:   Tue Apr 22 22:55:36 2014 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=d23b872316b45cbaf6bbcbd23066a643721f151d


commit d23b872316b45cbaf6bbcbd23066a643721f151d
Author: Markus Gothe <address@hidden>
Date:   Tue Apr 22 22:55:15 2014 +0200

    Check if we are using GNU LD or not before setting GNU LD-specific flags.

diff --git a/configure.ac b/configure.ac
index 41683cd..f19cca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2881,14 +2881,17 @@ AC_ARG_ENABLE([harden],
   [harden=yes]
 )
 
-if test x"$harden" = x"yes" -a x"${host_cpu}" != mips -a x"${android}" != 
xyes; then
+if test x"$harden" = x"yes" -a x"${host_cpu}" != x"mips" -a x"${android}" != 
xyes; then
     CPPFLAGS="${CPPFLAGS} -D_FORTIFY_SOURCE=2"
     CFLAGS="${CFLAGS} -fPIE -fstack-protector --param ssp-buffer-size=4 
-Wformat -Werror=format-security"
     CXXFLAGS="${CXXFLAGS} -fPIE -fstack-protector --param ssp-buffer-size=4 
-Wformat -Werror=format-security"
-    if test x"$darwin" = x"yes"; then
+
+    if test x"$with_gnu_ld" = x"yes"; then
+      LDFLAGS="${LDFLAGS} -fPIE -pie -Wl,-z,relro -Wl,-z,now"
+    elif test x"$darwin" = x"yes"; then
       LDFLAGS="${LDFLAGS} -fPIE -pie"
     else
-      LDFLAGS="${LDFLAGS} -fPIE -pie -Wl,-z,relro -Wl,-z,now"
+      LDFLAGS="${LDFLAGS}"
     fi
 fi
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash