summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-23 01:43:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-23 01:43:35 +0000
commite2b54072b5f3b93a15056efdf54697f36f674eb8 (patch)
tree6dec2c009a44aaf4ecb029aaa2263efc4bcc7023
parentc9bbb3a8b8c2c09bd42af684319bcfb1983a6a6c (diff)
* configure.in: disable rubygems not to load rbconfig.rb before
fake.rb. [ruby-core:44492][Bug #6329] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 36f26cf..ed79598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 2df023b..e40354a 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],