From 8a4656c9be86d89237ed6ecc1885801618c57521 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 2 Jun 2018 12:17:16 +0000 Subject: gmake.mk: update in the source directory properly git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 2 +- defs/gmake.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 259f1fba2e..d24d5a4187 100644 --- a/Makefile.in +++ b/Makefile.in @@ -421,7 +421,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS) fi $(Q) touch $@ -probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp) +probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp) @$(ECHO) processing probes in object files $(Q) $(RM) $@ $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS) diff --git a/defs/gmake.mk b/defs/gmake.mk index d3396dc8e3..63e63ee7a9 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -139,7 +139,16 @@ $(TIMESTAMPDIR)/.exec.time: .PHONY: commit commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) @$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit' - $(Q)$(MAKE) $(mflags) Q=$(Q) srcs_vpath='$(srcdir)/' REVISION_FORCE=PHONY update-src srcs all-incs + +$(Q) \ + { \ + cd "$(srcdir)"; \ + sed 's/^@.*@$$//;s/@[A-Z][A-Z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \ + sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \ + } | \ + $(MAKE) $(mflags) Q=$(Q) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \ + BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \ + VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY -f - \ + update-src srcs all-incs ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2) extract-gems: update-gems -- cgit v1.2.3