From b421f1a7158e364f515c2d8ce6c1beb94070d6e3 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 4 Feb 2018 09:34:16 +0000 Subject: common.mk: MJIT_MIN_HEADER * common.mk ($(MJIT_MIN_HEADER)): moved duplicate recipe from Makefile.in and win32/Makefile.sub. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 5 ----- common.mk | 4 ++++ win32/Makefile.sub | 4 ---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index cb1eb75f58..0ae948703d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,6 @@ DOCTARGETS = @RDOCTARGET@ @CAPITARGET@ EXTOUT = @EXTOUT@ arch_hdrdir = $(EXTOUT)/include/$(arch) VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing -MJIT_MIN_HEADER = $(EXTOUT)/include/$(arch)/rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h empty = CC_VERSION = @CC_VERSION@ @@ -413,10 +412,6 @@ rb_mjit_header.h: PHONY probes.h $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(COUTFLAG) $@.new -E -P -dD $(Q) $(IFCHANGE) $@ $@.new -$(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb - $(ECHO) building $@ - $(BASERUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC)" rb_mjit_header.h $@ - # DTrace static library hacks described here: # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html ruby-glommed.$(OBJEXT): diff --git a/common.mk b/common.mk index 5f657fc7c6..3eb576ed55 100644 --- a/common.mk +++ b/common.mk @@ -192,6 +192,10 @@ all: $(SHOWFLAGS) main docs main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs $(MJIT_MIN_HEADER) @$(NULLCMD) +$(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb + $(ECHO) building $@ + $(BASERUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC)" rb_mjit_header.h $@ + .PHONY: showflags exts enc trans: $(SHOWFLAGS) showflags: diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a32639728b..d42625c692 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1191,10 +1191,6 @@ rb_mjit_header.h: PHONY probes.h $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c -P $(Q) $(IFCHANGE) $@ vm.i -$(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb - $(ECHO) building $@ - $(BASERUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC)" rb_mjit_header.h $@ - INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ vmtc.inc vm.inc -- cgit v1.2.3