nobu	2018-02-04 22:43:06 +0900 (Sun, 04 Feb 2018)

  New Revision: 62202

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62202

  Log:
    common.mk: rb_mjit_header.h
    
    * common.mk (rb_mjit_header.h): moved from Makefile.in and
      win32/Makefile.sub.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.ac
    trunk/win32/Makefile.sub
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 62201)
+++ Makefile.in	(revision 62202)
@@ -69,6 +69,7 @@ warnflags = @warnflags@ @strict_warnflag https://github.com/ruby/ruby/blob/trunk/Makefile.in#L69
 cppflags = @cppflags@
 XCFLAGS = @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DLIBRUBY_LIBDIR=\""$(prefix)/lib"\" -DMJIT_HEADER_INSTALL_DIR=\""$(prefix)/include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
+MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = @EXTLDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
@@ -407,11 +408,6 @@ probes.@OBJEXT@: $(srcdir)/probes.d $(DT https://github.com/ruby/ruby/blob/trunk/Makefile.in#L408
 	$(Q) $(RM) $@
 	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
 
-rb_mjit_header.h: PHONY probes.h
-	$(ECHO) building $@
-	$(Q) $(CC) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(COUTFLAG) $@.new -E -P -dD
-	$(Q) $(IFCHANGE) $@ $@.new
-
 # DTrace static library hacks described here:
 # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
 ruby-glommed.$(OBJEXT):
Index: common.mk
===================================================================
--- common.mk	(revision 62201)
+++ common.mk	(revision 62202)
@@ -192,6 +192,11 @@ all: $(SHOWFLAGS) main docs https://github.com/ruby/ruby/blob/trunk/common.mk#L192
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs $(MJIT_MIN_HEADER)
 	@$(NULLCMD)
 
+rb_mjit_header.h: PHONY probes.h
+	$(ECHO) building $@
+	$(Q) $(CPP) $(MJIT_HEADER_FLAGS) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(COUTFLAG)$@.new
+	$(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 $@
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 62201)
+++ win32/Makefile.sub	(revision 62202)
@@ -283,6 +283,7 @@ LDSHARED_1 = @if exist $(@).manifest $(M https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L283
 LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
 !endif
 CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DLIBRUBY_LIBDIR=\""$(prefix)/lib"\" -DMJIT_HEADER_INSTALL_DIR=\""$(prefix)/include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
+MJIT_HEADER_FLAGS = -P
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS =
@@ -1192,11 +1193,6 @@ probes.h: {$(VPATH)}probes.dmyh https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1193
 #include "$(*F).dmyh"
 <<KEEP
 
-rb_mjit_header.h: PHONY probes.h
-	$(ECHO) building $@
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c -P
-	$(Q) $(IFCHANGE) $@ vm.i
-
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc mjit_compile.inc
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 62201)
+++ configure.ac	(revision 62202)
@@ -533,6 +533,8 @@ AS_IF([test "$GCC" = yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L533
     # a mistake of silly C extensions.
     RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
 
+    : ${MJIT_HEADER_FLAGS='-P -dD'}
+
     # -fstack-protector
     AS_CASE(["$target_os"],
     [mingw*], [
@@ -2450,6 +2452,7 @@ LIBEXT=a https://github.com/ruby/ruby/blob/trunk/configure.ac#L2452
 
 AC_SUBST(DLDFLAGS)dnl
 AC_SUBST(ARCH_FLAG)dnl
+AC_SUBST(MJIT_HEADER_FLAGS)dnl
 
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl

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