nobu	2013-01-21 15:41:38 +0900 (Mon, 21 Jan 2013)

  New Revision: 38892

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

  Log:
    mkconfig.rb: no BASERUBY
    
    * tool/mkconfig.rb: BASERUBY is transient at core build.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/tool/mkconfig.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38891)
+++ ChangeLog	(revision 38892)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Jan 21 15:41:33 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/mkconfig.rb: BASERUBY is transient at core build.
+
 Mon Jan 21 13:51:21 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb ($extmk): traverse parent directories for the case
Index: common.mk
===================================================================
--- common.mk	(revision 38891)
+++ common.mk	(revision 38892)
@@ -936,7 +936,7 @@ $(srcdir)/ext/ripper/ripper.c: parse.y https://github.com/ruby/ruby/blob/trunk/common.mk#L936
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=.
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 
 $(srcdir)/ext/dl/callback/callback.c: $(srcdir)/ext/dl/callback/mkcallback.rb $(srcdir)/ext/dl/dl.h
 	$(ECHO) generating $@
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 38891)
+++ tool/mkconfig.rb	(revision 38892)
@@ -73,7 +73,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L73
   if name
     case name
     when /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/; next
-    when /^(?:X|(?:MINI|RUN)RUBY$)/; next
+    when /^(?:X|(?:MINI|RUN|BASE)RUBY$)/; next
     when /^(?:MAJOR|MINOR|TEENY)$/; next
     when /^RUBY_INSTALL_NAME$/; next if $install_name
     when /^RUBY_SO_NAME$/; next if $so_name
@@ -132,7 +132,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L132
         val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
       end
     end
-    v = "  CONFIG[\"#{name}\"] #{win32 && vars[name] ? '<< "\n" +' : '='} #{val}\n"
+    v = "  CONFIG[\"#{name}\"] #{win32 && vars[name] ? '<< "\n"' : '='} #{val}\n"
     vars[name] = true
     if fast[name]
       v_fast << v

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