From 9c1abe2a6c5e6288ed208000fbf811d145af9355 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Fri, 15 Nov 2019 03:51:06 +0900 Subject: load prelude.rb by builtin features. The script in prelude.rb was embed in MRI to load it (eval this script at everyboot). This commit change the loading process of prelude.rb. MRI doesn't eval a script, but load from compiled binary with builtin feature. So that Init_prelude() does not load `prelude.rb` now. --- common.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index e382b22a66..b117008561 100644 --- a/common.mk +++ b/common.mk @@ -163,7 +163,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) -PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(DEFAULT_PRELUDES) +PRELUDE_SCRIPTS = $(DEFAULT_PRELUDES) GEM_PRELUDE = $(srcdir)/gem_prelude.rb PRELUDES = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c GOLFPRELUDES = {$(srcdir)}golf_prelude.c @@ -1000,6 +1000,7 @@ BUILTIN_RB_SRCS = \ $(srcdir)/io.rb \ $(srcdir)/pack.rb \ $(srcdir)/trace_point.rb \ + $(srcdir)/prelude.rb \ $(empty) BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc) @@ -2231,6 +2232,8 @@ inits.$(OBJEXT): {$(VPATH)}onigmo.h inits.$(OBJEXT): {$(VPATH)}oniguruma.h inits.$(OBJEXT): {$(VPATH)}st.h inits.$(OBJEXT): {$(VPATH)}subst.h +inits.$(OBJEXT): {$(VPATH)}builtin.h +inits.$(OBJEXT): {$(VPATH)}prelude.rbinc io.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h io.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h io.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -2689,7 +2692,6 @@ prelude.$(OBJEXT): {$(VPATH)}node.h prelude.$(OBJEXT): {$(VPATH)}onigmo.h prelude.$(OBJEXT): {$(VPATH)}oniguruma.h prelude.$(OBJEXT): {$(VPATH)}prelude.c -prelude.$(OBJEXT): {$(VPATH)}prelude.rb prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h prelude.$(OBJEXT): {$(VPATH)}st.h -- cgit v1.2.3