diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-04 15:17:44 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-04 15:17:44 +0000 |
| commit | 24fcc0275b9c9397300aaf1790667287b601de78 (patch) | |
| tree | 08b45e74f5835d1c27c34576857b37e245aec52f | |
| parent | bfae4b5d06fa7502b5afd848659c8136ce0e9dde (diff) | |
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
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 11c772cbc6..840e804310 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 $@ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 094ce90c78..e94b0c98ae 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -209,6 +209,9 @@ OUTFLAG = -Fe !if !defined(COUTFLAG) COUTFLAG = -Fo !endif +!if !defined(CPPOUTFLAG) +CPPOUTFLAG = -Fi +!endif !if !defined(CSRCFLAG) CSRCFLAG = -Tc !endif |