nobu	2018-02-06 23:45:11 +0900 (Tue, 06 Feb 2018)

  New Revision: 62256

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

  Log:
    common.mk: MJIT_CPPFLAGS
    
    * common.mk (MJIT_CPPFLAGS): moved common definition flags for
      mjit compilation.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 62255)
+++ common.mk	(revision 62256)
@@ -60,7 +60,12 @@ RDOCOUT       = $(EXTOUT)/rdoc https://github.com/ruby/ruby/blob/trunk/common.mk#L60
 HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
 MJIT_HEADER   = rb_mjit_header.h
-MJIT_MIN_HEADER = $(EXTOUT)/include/$(arch)/rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h
+MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h
+MJIT_CPPFLAGS = -DMJIT_HEADER_INSTALL_DIR=\""$(MJIT_HEADER_INSTALL_DIR)"\" \
+		-DMJIT_HEADER_BUILD_DIR=\""$(MJIT_HEADER_BUILD_DIR)"\" \
+		-DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\"
+MJIT_HEADER_BUILD_DIR = $(EXTOUT)/include/$(arch)
+MJIT_HEADER_INSTALL_DIR = include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)
 
 INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 62255)
+++ win32/Makefile.sub	(revision 62256)
@@ -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) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DMJIT_HEADER_INSTALL_DIR=\""include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
+CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) $(MJIT_CPPFLAGS)
 MJIT_HEADER_FLAGS = -P
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 62255)
+++ Makefile.in	(revision 62256)
@@ -69,7 +69,7 @@ debugflags = @debugflags@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L69
 warnflags = @warnflags@ @strict_warnflags@
 cppflags = @cppflags@
 XCFLAGS = @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DMJIT_HEADER_INSTALL_DIR=\""include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
+CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(MJIT_CPPFLAGS)
 MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =

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