kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Makefile.sub: cpp out for older VC

Browse source 
* win32/Makefile.sub (CPPOUTFLAG, MJIT_HEADER_FLAGS): -Fi option
  is available since VC 10.  redirect stdout on older versions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-02-11 01:01:09 +00:00
parent 2b79ab512c
commit cb1cde4621
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
win32/Makefile.sub
View file

@ -213,7 +213,11 @@ OUTFLAG = -Fe
COUTFLAG = -Fo COUTFLAG = -Fo
!endif !endif
!if !defined(CPPOUTFLAG) !if !defined(CPPOUTFLAG)
! if $(MSC_VER) < 1600
CPPOUTFLAG = >
! else
CPPOUTFLAG = -Fi CPPOUTFLAG = -Fi
! endif
!endif !endif
!if !defined(CSRCFLAG) !if !defined(CSRCFLAG)
CSRCFLAG = -Tc CSRCFLAG = -Tc
@ -289,7 +293,11 @@ LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -ou
LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
!endif !endif
CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
!if "$(CPPOUTFLAG)" == ">"
MJIT_HEADER_FLAGS =
!else
MJIT_HEADER_FLAGS = -P MJIT_HEADER_FLAGS = -P
!endif
MJIT_HEADER_SUFFIX = MJIT_HEADER_SUFFIX =
MJIT_HEADER_ARCH = MJIT_HEADER_ARCH =
MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch) MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch)