ruby-changes:50234
From: nobu <ko1@a...>
Date: Sun, 11 Feb 2018 10:01:13 +0900 (JST)
Subject: [ruby-changes:50234] nobu:r62352 (trunk): Makefile.sub: cpp out for older VC
nobu 2018-02-11 10:01:09 +0900 (Sun, 11 Feb 2018) New Revision: 62352 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62352 Log: Makefile.sub: cpp out for older VC * win32/Makefile.sub (CPPOUTFLAG, MJIT_HEADER_FLAGS): -Fi option is available since VC 10. redirect stdout on older versions. Modified files: trunk/win32/Makefile.sub Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 62351) +++ win32/Makefile.sub (revision 62352) @@ -213,7 +213,11 @@ OUTFLAG = -Fe https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L213 COUTFLAG = -Fo !endif !if !defined(CPPOUTFLAG) +! if $(MSC_VER) < 1600 +CPPOUTFLAG = > +! else CPPOUTFLAG = -Fi +! endif !endif !if !defined(CSRCFLAG) CSRCFLAG = -Tc @@ -289,7 +293,11 @@ LDSHARED_1 = @if exist $(@).manifest $(M https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L293 LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest !endif CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) +!if "$(CPPOUTFLAG)" == ">" +MJIT_HEADER_FLAGS = +!else MJIT_HEADER_FLAGS = -P +!endif MJIT_HEADER_SUFFIX = MJIT_HEADER_ARCH = MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/