mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
common.mk: CPPOUTFLAG
* 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:
parent
bfae4b5d06
commit
24fcc0275b
3 changed files with 6 additions and 2 deletions
|
@ -59,6 +59,7 @@ empty =
|
|||
CC_VERSION = @CC_VERSION@
|
||||
OUTFLAG = @OUTFLAG@$(empty)
|
||||
COUTFLAG = @COUTFLAG@$(empty)
|
||||
CPPOUTFLAG = $(COUTFLAG)
|
||||
ARCH_FLAG = @ARCH_FLAG@
|
||||
CFLAGS_NO_ARCH = @CFLAGS@
|
||||
CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
|
||||
|
|
|
@ -197,8 +197,8 @@ mjit-headers: $(MJIT_MIN_HEADER)
|
|||
|
||||
rb_mjit_header.h: PHONY probes.h
|
||||
$(ECHO) building $@
|
||||
$(Q) $(CPP) $(MJIT_HEADER_FLAGS) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(COUTFLAG)vm.i
|
||||
$(Q) $(IFCHANGE) $@ vm.i
|
||||
$(Q) $(CPP) $(MJIT_HEADER_FLAGS) $(CFLAGS_NO_ARCH) $(XCFLAGS) $(CPPFLAGS) -DMJIT_HEADER $(srcdir)/vm.c $(CPPOUTFLAG)vm.new
|
||||
$(Q) $(IFCHANGE) $@ vm.new
|
||||
|
||||
$(MJIT_MIN_HEADER): rb_mjit_header.h $(srcdir)/tool/transform_mjit_header.rb
|
||||
$(ECHO) building $@
|
||||
|
|
|
@ -209,6 +209,9 @@ OUTFLAG = -Fe
|
|||
!if !defined(COUTFLAG)
|
||||
COUTFLAG = -Fo
|
||||
!endif
|
||||
!if !defined(CPPOUTFLAG)
|
||||
CPPOUTFLAG = -Fi
|
||||
!endif
|
||||
!if !defined(CSRCFLAG)
|
||||
CSRCFLAG = -Tc
|
||||
!endif
|
||||
|
|
Loading…
Reference in a new issue