diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-06 15:55:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-06 15:55:12 +0000 |
| commit | 7449619dd3c2ea0d91e6e7a20c5148eea755641c (patch) | |
| tree | c78e6186f9ce027daa52ace3a8a6e3fab5f49a76 | |
| parent | 87b0af2a2b16f109b740c9b73a4fa3e68536e133 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 23cf74f2a7..62d24e5476 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,8 +68,8 @@ optflags = @optflags@ 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 = diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 3c5c468e90..7153612519 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -285,7 +285,7 @@ LDSHARED_0 = @if exist $(@).manifest $(MINIRUBY) -run -e wait_writable -- -n 10 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 s,@try_header@,try_compile,;t t s,@ruby_pc@,$(ruby_pc),;t t <<KEEP +XCFLAGS = $(XCFLAGS) $(MJIT_CPPFLAGS) miniruby: miniruby$(EXEEXT) |