nobu	2018-02-05 00:17:44 +0900 (Mon, 05 Feb 2018)

  New Revision: 62208

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

  Log:
    common.mk: CPPOUTFLAG
    
    * common.mk (rb_mjit_header.h): use $(CPPOUTFLAG).
    
    * win32/Makefile.sub (CPPOUTFLAG): needs -Fi to let cl.exe name
      preprocessed file, instead of -Fo.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 62207)
+++ common.mk	(revision 62208)
@@ -197,8 +197,8 @@ mjit-headers: $(MJIT_MIN_HEADER) https://github.com/ruby/ruby/blob/trunk/common.mk#L197
 
 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)vm.i
-	$(Q) $(IFCHANGE) $@ vm.i
+	$(Q) $(CPP) $(MJIT_HEADER_FLAGS) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(CPPOUTFLAG)vm.new
+	$(Q) $(IFCHANGE) $@ vm.new
 
 $(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb
 	$(ECHO) building $@
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 62207)
+++ win32/Makefile.sub	(revision 62208)
@@ -209,6 +209,9 @@ OUTFLAG       = -Fe https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L209
 !if !defined(COUTFLAG)
 COUTFLAG      = -Fo
 !endif
+!if !defined(CPPOUTFLAG)
+CPPOUTFLAG    = -Fi
+!endif
 !if !defined(CSRCFLAG)
 CSRCFLAG      = -Tc
 !endif
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 62207)
+++ Makefile.in	(revision 62208)
@@ -59,6 +59,7 @@ empty = https://github.com/ruby/ruby/blob/trunk/Makefile.in#L59
 CC_VERSION = @CC_VERSION@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
+CPPOUTFLAG = $(COUTFLAG)
 ARCH_FLAG = @ARCH_FLAG@
 CFLAGS_NO_ARCH = @CFLAGS@
 CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)

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