summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2022-09-18 20:49:46 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2022-09-18 21:16:15 +0900
commit45ecc30a6342e1322f07e68280a5107db8075da0 (patch)
tree25833f3de431d65b9921936c7d754a3343fc5682
parent0ca037b35cdf14bc6b3910560c786936585cf6fc (diff)
downloadruby-45ecc30a6342e1322f07e68280a5107db8075da0.tar.gz
Move mjit/instruction.rb rule to common.mk
as suggested by nobu. We don't really need to generate this for Windows, but using common.mk whenever possible would probably make maintenance easier.
-rw-r--r--common.mk5
-rw-r--r--template/Makefile.in5
2 files changed, 5 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index 2956e2c93e..14bb2ead5c 100644
--- a/common.mk
+++ b/common.mk
@@ -225,6 +225,11 @@ all: $(SHOWFLAGS) main docs
main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
@$(NULLCMD)
+main: $(srcdir)/lib/mjit/instruction.rb
+$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def
+ $(ECHO) generating $@
+ $(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@
+
mjit-headers: $(MJIT_SUPPORT)-mjit-headers
no-mjit-headers: PHONY
yes-mjit-headers: mjit_config.h PHONY
diff --git a/template/Makefile.in b/template/Makefile.in
index 7e12efabb7..1a7843edb6 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -504,11 +504,6 @@ clean-local::
$(Q)$(RM) -r mjit_build_dir.*
-$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) $(MJIT_HEADER_BUILD_DIR) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD)
-main: $(srcdir)/lib/mjit/instruction.rb
-$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def
- $(ECHO) generating $@
- $(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@
-
# DTrace static library hacks described here:
# https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4
ruby-glommed.$(OBJEXT):