Skip to content

Commit

Permalink
common.mk: revert to MINIRUBY
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nobu committed Mar 27, 2015
1 parent 785438a commit 62d8e6d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Fri Mar 27 16:34:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>

* 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 <shibata.hiroshi@gmail.com>

* test/test_observer.rb: add tests for Observable module.
Expand Down
2 changes: 1 addition & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 62d8e6d

Please sign in to comment.