nobu	2018-02-07 00:55:12 +0900 (Wed, 07 Feb 2018)

  New Revision: 62261

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

  Log:
    moved MJIT_CPPFLAGS
    
    * Makefile.in, win32/Makefile.sub (XCFLAGS): moved MJIT_CPPFLAGS
      from CPPFLAGS.  MJIT_CPPFLAGS is only for mjit.c, unused in
      extension libraries.

  Modified files:
    trunk/Makefile.in
    trunk/win32/Makefile.sub
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 62260)
+++ win32/Makefile.sub	(revision 62261)
@@ -285,7 +285,7 @@ LDSHARED_0 = @if exist $(@).manifest $(M https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L285
 LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2
 LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
 !endif
-CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) $(MJIT_CPPFLAGS)
+CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 MJIT_HEADER_FLAGS = -P
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
@@ -997,6 +997,7 @@ s,@top_srcdir@,$(srcdir),;t t https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L997
 s,@try_header@,try_compile,;t t
 s,@ruby_pc@,$(ruby_pc),;t t
 <<KEEP
+XCFLAGS = $(XCFLAGS) $(MJIT_CPPFLAGS)
 
 miniruby: miniruby$(EXEEXT)
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 62260)
+++ Makefile.in	(revision 62261)
@@ -68,8 +68,8 @@ optflags = @optflags@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L68
 debugflags = @debugflags@
 warnflags = @warnflags@ @strict_warnflags@
 cppflags = @cppflags@
-XCFLAGS = @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(MJIT_CPPFLAGS)
+XCFLAGS = @XCFLAGS@ $(MJIT_CPPFLAGS)
+CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
 MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =

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