diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Apr 23 10:43:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: disable rubygems not to load rbconfig.rb before + fake.rb. [ruby-core:44492][Bug #6329] + Sun Apr 22 20:26:06 2012 Tanaka Akira <akr@fsij.org> * lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to diff --git a/configure.in b/configure.in index 2df023b57d..e40354af89 100644 --- a/configure.in +++ b/configure.in @@ -19,8 +19,13 @@ AC_ARG_WITH(baseruby, [ BASERUBY="ruby" ]) -test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 || +if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then + if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'p 42' 2>/dev/null`" = 42; then + BASERUBY="$BASERUBY --disable=gems" + fi +else BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" +fi AC_SUBST(BASERUBY) AC_DEFUN([RUBY_MINGW32], |