From 5e8896e4bd6f46e07a45b614d27b8f356f6f53ca Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 9 Aug 2018 13:32:49 +0000 Subject: gmake.mk: fix commit dependency * defs/gmake.mk (commit): pass CONFIGURE and fix dependency of `reconfig` target, not to try to make config.status newer than the source directory. and remove configure_args in common.mk, which is a garbage argument. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- defs/gmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defs/gmake.mk b/defs/gmake.mk index 63e63ee7a9..86733bceea 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -142,12 +142,12 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS +$(Q) \ { \ cd "$(srcdir)"; \ - sed 's/^@.*@$$//;s/@[A-Z][A-Z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \ + sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-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 - \ + VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \ update-src srcs all-incs ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2) -- cgit v1.2.3