diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Nov 27 18:25:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (-fstack-protector): also needed in DLDFLAGS. + [Bug#5676] + Sun Nov 27 14:13:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * configure.in: add -fstack-protector into XLDFLAGS as well as diff --git a/configure.in b/configure.in index 620f320ddd..510f0ebdcd 100644 --- a/configure.in +++ b/configure.in @@ -497,8 +497,12 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then fi if test "$GCC" = yes; then RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)]) - RUBY_TRY_CFLAGS(-fstack-protector, [RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector) - RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)]) + RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no]) + 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 if test "$GCC" = ""; then |