summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-13 07:29:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-13 07:29:21 +0000
commit621b05ed61b238f2ec66b36f204e247d1ff775b9 (patch)
tree292a7eb9a45259d1c4724f4e9db054c2bc42319c
parentf7ca4f30c401df017fc80db94daebd49a0e90f39 (diff)
configure.in: make BOOTSTRAPRUBY MINIRUBY
* configure.in (BOOTSTRAPRUBY): use MINIRUBY but not BASERUBY unless cross compiling. [ruby-core:72065] [Bug #11807] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0aa067f..35ba944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 13 16:29:22 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (BOOTSTRAPRUBY): use MINIRUBY but not BASERUBY
+ unless cross compiling. [ruby-core:72065] [Bug #11807]
+
Sun Dec 13 14:17:19 2015 Akinori MUSHA <knu@iDaemons.org>
* test/test_shellwords.rb (TestShellwords): Add many more tests
diff --git a/configure.in b/configure.in
index 134e024..5207fad 100644
--- a/configure.in
+++ b/configure.in
@@ -3552,9 +3552,6 @@ else
RUNRUBY='$(RUNRUBY_COMMAND) --'
XRUBY='$(RUNRUBY)'
BOOTSTRAPRUBY='$(MINIRUBY)'
- test x"${HAVE_BASERUBY}" = xyes &&
- ${BASERUBY} -e 'exit module A;def foo;end;instance_methods;end.include?(:foo)' &&
- BOOTSTRAPRUBY='$(BASERUBY)'
TEST_RUNNABLE=yes
CROSS_COMPILING=no
fi