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

common.mk: CPPOUTFLAG

Browse source 
* common.mk (rb_mjit_header.h): use $(CPPOUTFLAG).

* win32/Makefile.sub (CPPOUTFLAG): needs -Fi to let cl.exe name
  preprocessed file, instead of -Fo.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-02-04 15:17:44 +00:00
parent bfae4b5d06
commit 24fcc0275b
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -59,6 +59,7 @@ empty =
CC_VERSION = @CC_VERSION@ CC_VERSION = @CC_VERSION@
OUTFLAG = @OUTFLAG@$(empty) OUTFLAG = @OUTFLAG@$(empty)
COUTFLAG = @COUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty)
CPPOUTFLAG = $(COUTFLAG)
ARCH_FLAG = @ARCH_FLAG@ ARCH_FLAG = @ARCH_FLAG@
CFLAGS_NO_ARCH = @CFLAGS@ CFLAGS_NO_ARCH = @CFLAGS@
CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG) CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)

4
common.mk
View file

@ -197,8 +197,8 @@ mjit-headers: $(MJIT_MIN_HEADER)
rb_mjit_header.h: PHONY probes.h rb_mjit_header.h: PHONY probes.h
$(ECHO) building $@ $(ECHO) building $@
$(Q) $(CPP) $(MJIT_HEADER_FLAGS) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(COUTFLAG)vm.i $(Q) $(CPP) $(MJIT_HEADER_FLAGS) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(CPPOUTFLAG)vm.new
$(Q) $(IFCHANGE) $@ vm.i $(Q) $(IFCHANGE) $@ vm.new
$(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb $(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb
$(ECHO) building $@ $(ECHO) building $@

3
win32/Makefile.sub
View file

@ -209,6 +209,9 @@ OUTFLAG = -Fe
!if !defined(COUTFLAG) !if !defined(COUTFLAG)
COUTFLAG = -Fo COUTFLAG = -Fo
!endif !endif
!if !defined(CPPOUTFLAG)
CPPOUTFLAG = -Fi
!endif
!if !defined(CSRCFLAG) !if !defined(CSRCFLAG)
CSRCFLAG = -Tc CSRCFLAG = -Tc
!endif !endif