From 62d8e6d1b12718b408e57b2b927c3b2931cad6d9 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 27 Mar 2015 07:34:18 +0000 Subject: common.mk: revert to MINIRUBY * common.mk: revert using BOOTSTRAPRUBY for enc.mk, as enc/depend uses CONFIG. [ruby-core:68647] [Bug #11004] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ common.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 15c368d785..b91ef7d74d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 27 16:34:16 2015 Nobuyoshi Nakada + + * common.mk: revert using BOOTSTRAPRUBY for enc.mk, as + enc/depend uses CONFIG. [ruby-core:68647] [Bug #11004] + Thu Mar 26 10:05:13 2015 SHIBATA Hiroshi * test/test_observer.rb: add tests for Observable module. diff --git a/common.mk b/common.mk index a513cdee15..e6fd94186b 100644 --- a/common.mk +++ b/common.mk @@ -624,7 +624,7 @@ libtrans trans: {$(VPATH)}transdb.h $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ $(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) $(ECHO) generating $@ - $(Q) $(BOOTSTRAPRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $@ $(ENCS) + $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $@ $(ENCS) .PRECIOUS: $(MKFILES) -- cgit v1.2.3