nobu	2014-11-27 17:32:01 +0900 (Thu, 27 Nov 2014)

  New Revision: 48607

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

  Log:
    common.mk: prelude.c by BASERUBY
    
    * common.mk (prelude.c): no longer depends on miniruby, since not
      depending on rbconfig.rb.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48606)
+++ ChangeLog	(revision 48607)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Nov 27 17:31:58 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (prelude.c): no longer depends on miniruby, since not
+	  depending on rbconfig.rb.
+
 Thu Nov 27 17:12:14 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (miniprelude.c): miniruby needs no preludes.
Index: common.mk
===================================================================
--- common.mk	(revision 48606)
+++ common.mk	(revision 48607)
@@ -460,7 +460,7 @@ clean: clean-ext clean-local clean-enc c https://github.com/ruby/ruby/blob/trunk/common.mk#L460
 clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
 	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
 clean-runnable:: PHONY
 	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || exit 0
@@ -483,7 +483,6 @@ distclean-local:: clean-local https://github.com/ruby/ruby/blob/trunk/common.mk#L483
 	$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
 distclean-ext:: PHONY
 distclean-golf: clean-golf
-	$(Q)$(RM) $(GOLFPRELUDES)
 distclean-rdoc: PHONY
 distclean-capi: PHONY
 distclean-extout: clean-extout
@@ -491,9 +490,10 @@ distclean-platform: clean-platform https://github.com/ruby/ruby/blob/trunk/common.mk#L490
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
+	$(Q)$(RM) parse.c parse.h lex.c newline.c $(PRELUDES) revision.h
 realclean-ext:: PHONY
 realclean-golf: distclean-golf
+	$(Q)$(RM) $(GOLFPRELUDES)
 realclean-capi: PHONY
 realclean-extout: distclean-extout
 
@@ -777,14 +777,14 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) {$( https://github.com/ruby/ruby/blob/trunk/common.mk#L777
 $(PRELUDE_C): $(COMPILE_PRELUDE) \
 	   {$(srcdir)}lib/rubygems/defaults.rb \
 	   {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
-	   $(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS)
+	   $(PRELUDE_SCRIPTS) $(LIB_SRCS)
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
 
-{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb $(PREP)
+{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
 
 probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
@@ -792,7 +792,7 @@ probes.dmyh: {$(srcdir)}probes.d $(srcdi https://github.com/ruby/ruby/blob/trunk/common.mk#L792
 
 probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 
-prereq: incs srcs {$(VPATH)}miniprelude.c PHONY
+prereq: incs srcs preludes PHONY
 
 preludes: {$(VPATH)}prelude.c
 preludes: {$(VPATH)}miniprelude.c

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