nobu	2015-03-07 11:06:06 +0900 (Sat, 07 Mar 2015)

  New Revision: 49881

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49881

  Log:
    configure.in: BOOTSTRAPRUBY
    
    * configure.in (BOOTSTRAPRUBY): baseruby if cross compiling or
      miniruby, anyway runnable ruby command.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/tool/mkconfig.rb
    trunk/win32/Makefile.sub
Index: configure.in
===================================================================
--- configure.in	(revision 49880)
+++ configure.in	(revision 49881)
@@ -3380,6 +3380,7 @@ if test x"$cross_compiling" = xyes; then https://github.com/ruby/ruby/blob/trunk/configure.in#L3380
   RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
   RUNRUBY='$(RUNRUBY_COMMAND)'
   XRUBY='$(MINIRUBY)'
+  BOOTSTRAPRUBY='$(BASERUBY)'
   TEST_RUNNABLE=no
   CROSS_COMPILING=yes
 
@@ -3403,6 +3404,7 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L3404
   RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
   RUNRUBY='$(RUNRUBY_COMMAND) --'
   XRUBY='$(RUNRUBY)'
+  BOOTSTRAPRUBY='$(MINIRUBY)'
   TEST_RUNNABLE=yes
   CROSS_COMPILING=no
 fi
@@ -3414,6 +3416,7 @@ AC_SUBST(PREP) https://github.com/ruby/ruby/blob/trunk/configure.in#L3416
 AC_SUBST(RUNRUBY_COMMAND)
 AC_SUBST(RUNRUBY)
 AC_SUBST(XRUBY)
+AC_SUBST(BOOTSTRAPRUBY)
 AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
Index: common.mk
===================================================================
--- common.mk	(revision 49880)
+++ common.mk	(revision 49881)
@@ -149,8 +149,6 @@ TESTOPTS      = $(RUBY_TESTOPTS) https://github.com/ruby/ruby/blob/trunk/common.mk#L149
 
 TESTRUN_SCRIPT = $(srcdir)/test.rb
 
-BOOTSTRAPRUBY = $(BASERUBY)
-
 COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
 
 all: showflags main docs
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 49880)
+++ win32/Makefile.sub	(revision 49881)
@@ -288,7 +288,9 @@ MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L288
 RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
 !if "$(CROSS_COMPILING)" == "yes"
 XRUBY = $(MINIRUBY)
+BOOTSTRAPRUBY = $(BASERUBY)
 !else
+BOOTSTRAPRUBY = $(MINIRUBY)
 XRUBY = $(RUNRUBY)
 !endif
 BTESTRUBY = $(MINIRUBY)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 49880)
+++ Makefile.in	(revision 49881)
@@ -113,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L113
 XRUBY_LIBDIR = @XRUBY_LIBDIR@
 XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
+BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 
 #### End of system configuration section. ####
 
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 49880)
+++ tool/mkconfig.rb	(revision 49881)
@@ -74,7 +74,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L74
   if name
     case name
     when /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/; next
-    when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BTEST)RUBY(?:_COMMAND)?$)/; next
+    when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BOOTSTRAP|BTEST)RUBY(?:_COMMAND)?$)/; next
     when /^INSTALLDOC|TARGET$/; next
     when /^DTRACE/; next
     when /^(?:MAJOR|MINOR|TEENY)$/; vars[name] = val; next

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/