From 4e0db2f75348fd28ae8ffd242044a020e41afef5 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 18 Sep 2022 23:20:44 +0900 Subject: [PATCH] mjit_c.rb doesn't need to be an erb --- .gitignore | 1 - common.mk | 5 ----- tool/ruby_vm/views/mjit_c.rb.erb => mjit_c.rb | 0 tool/mjit/bindgen.rb | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) rename tool/ruby_vm/views/mjit_c.rb.erb => mjit_c.rb (100%) diff --git a/.gitignore b/.gitignore index b7779c0ef2..4bbf24f094 100644 --- a/.gitignore +++ b/.gitignore @@ -235,7 +235,6 @@ lcov*.info # MJIT /include/ruby-*/*/rb_mjit_min_header-*.h /lib/mjit/instruction.rb -/mjit_c.rb /mjit_config.h /rb_mjit_header.h diff --git a/common.mk b/common.mk index ff0a2ca17f..52f132a2f8 100644 --- a/common.mk +++ b/common.mk @@ -239,11 +239,6 @@ $(srcdir)/lib/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/vie $(ECHO) generating $@ $(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@ -srcs: $(srcdir)/mjit_c.rb -$(srcdir)/mjit_c.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/mjit_c.rb.erb - $(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/tool/ruby_vm/views/mjit_c.rb.erb b/mjit_c.rb similarity index 100% rename from tool/ruby_vm/views/mjit_c.rb.erb rename to mjit_c.rb diff --git a/tool/mjit/bindgen.rb b/tool/mjit/bindgen.rb index 8fa20fe64c..5707019266 100755 --- a/tool/mjit/bindgen.rb +++ b/tool/mjit/bindgen.rb @@ -308,7 +308,7 @@ class BindingGenerator end src_dir = File.expand_path('../..', __dir__) -src_path = File.join(src_dir, 'tool/ruby_vm/views/mjit_c.rb.erb') +src_path = File.join(src_dir, 'mjit_c.rb') build_dir = File.expand_path(build_dir) cflags = [ src_dir,