[前][次][番号順一覧][スレッド一覧]

ruby-changes:60491

From: Takashi <ko1@a...>
Date: Tue, 24 Mar 2020 14:45:56 +0900 (JST)
Subject: [ruby-changes:60491] 5c4847f191 (master): Use miniruby to run tool/mjit_tabs.rb

https://git.ruby-lang.org/ruby.git/commit/?id=5c4847f191

From 5c4847f191eee0dc519a92fcb56c3dc38f075816 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Mon, 23 Mar 2020 22:42:50 -0700
Subject: Use miniruby to run tool/mjit_tabs.rb

hoping to fix https://github.com/ruby/actions/runs/527422022

diff --git a/common.mk b/common.mk
index d05a2df..e85ad34 100644
--- a/common.mk
+++ b/common.mk
@@ -224,9 +224,9 @@ mjit_config.h: Makefile https://github.com/ruby/ruby/blob/trunk/common.mk#L224
 # Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb.
 # So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated.
 $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \
-		$(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/mjit_tabs.rb
+		$(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/mjit_tabs.rb $(PREP)
 	$(ECHO) building $(@F:.time=.h)
-	$(Q) $(BASERUBY) $(srcdir)/tool/mjit_tabs.rb "$(MJIT_TABS)" \
+	$(MINIRUBY) $(srcdir)/tool/mjit_tabs.rb "$(MJIT_TABS)" \
 		$(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
 	$(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new
 
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]