diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-27 10:09:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-27 10:09:11 +0000 |
| commit | 9b58c2edf3dbb9adc4355e642e4124eeb47a43d5 (patch) | |
| tree | aaa9f82b6e598feb9cbdca1cd42169762a48ae9b | |
| parent | 41f756eaf3648156ad9645705bf843acdae73f2f (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -1,4 +1,6 @@ -Sun Nov 27 18:54:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Nov 27 19:09:02 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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) |