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, Makefile.in, win32/Makefile.sub (.dmyh.h): nmake merges

Browse source 
explicit rules for same target, but not merges exlicit rules and
  implicit rules -- always explict rules win.  So, need to add an
  explist rule for probes.h.
  reported by Heesob Park at [Bug #7421] [ruby-core:49839]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-22 09:16:48 +00:00
parent 1dec7384d1
commit 8e8d7bb7fc
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Nov 22 18:11:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk, Makefile.in, win32/Makefile.sub (.dmyh.h): nmake merges
explicit rules for same target, but not merges exlicit rules and
implicit rules -- always explict rules win. So, need to add an
explist rule for probes.h. [Bug #7421] [ruby-core:49839]
Thu Nov 22 18:01:28 2012 NARUSE, Yui <naruse@ruby-lang.org> Thu Nov 22 18:01:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
* Makefile.in (probes.o): add -C to ignore #include in probes.d. * Makefile.in (probes.o): add -C to ignore #include in probes.d.

4
Makefile.in
View file

@ -338,6 +338,10 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@ $(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
$(Q) $(RM) $@.tmp $(Q) $(RM) $@.tmp
{$(VPATH)}.dmyh.h:
@$(ECHO) copying dummy $(DEST_FILE)
$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
probes.@OBJEXT@: $(srcdir)/probes.d probes.@OBJEXT@: $(srcdir)/probes.d
@$(ECHO) processing probes in object files @$(ECHO) processing probes in object files
$(Q) stamp="$*.stamp"; \ $(Q) stamp="$*.stamp"; \

4
common.mk
View file

@ -901,10 +901,6 @@ $(srcdir)/probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
probes.h: $(srcdir)/probes.$(DTRACE_EXT) probes.h: $(srcdir)/probes.$(DTRACE_EXT)
{$(VPATH)}.dmyh.h:
@$(ECHO) copying dummy $(DEST_FILE)
$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
prereq: incs srcs preludes PHONY prereq: incs srcs preludes PHONY
preludes: {$(VPATH)}miniprelude.c preludes: {$(VPATH)}miniprelude.c

4
win32/Makefile.sub
View file

@ -1067,6 +1067,10 @@ ext/extinit.obj: ext/extinit.c $(SETUP)
$(ECHO) compiling ext/extinit.c $(ECHO) compiling ext/extinit.c
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
probes.h: {$(srcdir)}probes.dmyh
@$(ECHO) copying dummy $(DEST_FILE)
$(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
vmtc.inc vm.inc vmtc.inc vm.inc