1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written

Browse Source 
in common.mk (in which OBJ is defined) because of Makefile include
  and parse order. This partly reverts r49419.
  [ruby-dev:48849] [Bug #10808]

* Makefile.in (ruby-glommed.o): ditto.

* Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because
  it is included in $(OBJS) since r49451.

* Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ngoto 2015-02-03 10:43:27 +00:00
parent 3b4f191482
commit b7ff3d3b68
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Tue Feb 3 19:27:16 2015 Naohisa Goto <ngotogenome@gmail.com>
* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written
in common.mk (in which OBJ is defined) because of Makefile include
and parse order. This partly reverts r49419.
[ruby-dev:48849] [Bug #10808]
* Makefile.in (ruby-glommed.o): ditto.
* Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because
it is included in $(OBJS) since r49451.
* Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS)
Tue Feb 3 17:15:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Feb 3 17:15:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of

6
Makefile.in
View File

@ -382,7 +382,7 @@ enc/jis/props.h: enc/jis/props.kwd
@$(ECHO) copying dummy $(DEST_FILE) @$(ECHO) copying dummy $(DEST_FILE)
$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
probes.@OBJEXT@: $(srcdir)/probes.d probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_DEPENDENT_OBJS)
@$(ECHO) processing probes in object files @$(ECHO) processing probes in object files
$(Q) stamp="$*.stamp"; \ $(Q) stamp="$*.stamp"; \
if test -f "$$stamp" -o -f "$@"; then \ if test -f "$$stamp" -o -f "$@"; then \
@ -398,9 +398,9 @@ probes.@OBJEXT@: $(srcdir)/probes.d
# DTrace static library hacks described here: # DTrace static library hacks described here:
# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ) ruby-glommed.$(OBJEXT):
@$(ECHO) generating a glommed object with DTrace probes for static library @$(ECHO) generating a glommed object with DTrace probes for static library
$(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ) $(Q) $(LD) -r -o $@ $(OBJS)
clean-local:: clean-local::
$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \ $(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \

2
common.mk
View File

@ -713,6 +713,8 @@ verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
$(ECHO) creating $@ $(ECHO) creating $@
$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
ruby-glommed.$(OBJEXT): $(OBJS)
$(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h $(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h
INSNS2VMOPT = --srcdir="$(srcdir)" INSNS2VMOPT = --srcdir="$(srcdir)"