From 41f756eaf3648156ad9645705bf843acdae73f2f Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 27 Nov 2011 09:54:12 +0000 Subject: [PATCH] * Makefile.in (DLDFLAGS): also needs -fstack-protector. [Bug#5676] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++-- Makefile.in | 2 +- configure.in | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3092d4b1ac..c581968ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -Sun Nov 27 18:25:30 2011 Nobuyoshi Nakada +Sun Nov 27 18:54:05 2011 Nobuyoshi Nakada - * configure.in (-fstack-protector): also needed in DLDFLAGS. + * Makefile.in (DLDFLAGS): also needs -fstack-protector. [Bug#5676] Sun Nov 27 14:13:33 2011 KOSAKI Motohiro diff --git a/Makefile.in b/Makefile.in index abdee569a8..e614635dff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,7 +63,7 @@ EXTLIBS = LIBS = @LIBS@ $(EXTLIBS) MISSING = @LIBOBJS@ @ALLOCA@ LDSHARED = @LIBRUBY_LDSHARED@ -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG) +DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ MAINLIBS = @MAINLIBS@ ARCHMINIOBJS = @MINIOBJS@ diff --git a/configure.in b/configure.in index 510f0ebdcd..9df6ad6bac 100644 --- a/configure.in +++ b/configure.in @@ -501,7 +501,6 @@ if test "$GCC" = yes; then if test "x$stack_protector" = xyes; then RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector) RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector) - RUBY_APPEND_OPTION(DLDFLAGS, -fstack-protector) fi fi