diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-11 01:01:09 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-11 01:01:09 +0000 |
| commit | cb1cde4621d6706305831c7231ad8b46d7f57657 (patch) | |
| tree | 3be116be3de3bba40333226d93eeec93128c168a /win32/Makefile.sub | |
| parent | 2b79ab512c20395015692671524a01645757fc79 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5a43f571af..daf24a9855 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -213,7 +213,11 @@ OUTFLAG = -Fe 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 $(MANIFESTTOOL) -manifest $(@).manifest -ou 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) |