diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | common.mk | 2 |
3 files changed, 19 insertions, 3 deletions
@@ -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> * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of diff --git a/Makefile.in b/Makefile.in index 7a86cd5859..00ac990f4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -382,7 +382,7 @@ enc/jis/props.h: enc/jis/props.kwd @$(ECHO) copying dummy $(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 $(Q) stamp="$*.stamp"; \ if test -f "$$stamp" -o -f "$@"; then \ @@ -398,9 +398,9 @@ probes.@OBJEXT@: $(srcdir)/probes.d # DTrace static library hacks described here: # 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 - $(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ) + $(Q) $(LD) -r -o $@ $(OBJS) clean-local:: $(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \ @@ -713,6 +713,8 @@ verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(ECHO) creating $@ $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl +ruby-glommed.$(OBJEXT): $(OBJS) + $(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h INSNS2VMOPT = --srcdir="$(srcdir)" |