From 9b58c2edf3dbb9adc4355e642e4124eeb47a43d5 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 27 Nov 2011 10:09:11 +0000 Subject: * configure.in (stack_protector): disable on mingw. [Bug#5676] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- configure.in | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c581968ad5..00f04dd026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Sun Nov 27 18:54:05 2011 Nobuyoshi Nakada +Sun Nov 27 19:09:02 2011 Nobuyoshi Nakada + + * configure.in (stack_protector): disable on mingw. [Bug#5676] * Makefile.in (DLDFLAGS): also needs -fstack-protector. [Bug#5676] diff --git a/configure.in b/configure.in index 9df6ad6bac..a57cec93a1 100644 --- a/configure.in +++ b/configure.in @@ -497,7 +497,13 @@ 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, [stack_protector=yes], [stack_protector=no]) + AS_CASE(["$target_os"], + [mingw*], [ + stack_protector=no + ], + [ + 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) -- cgit v1.2.3