summaryrefslogtreecommitdiff
path: root/defs
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-09 13:32:49 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-09 13:32:49 (GMT)
commitff57f6f69a6cf5fde61532e3b74d76ad619af614 (patch)
treec8f03520289e7048f668de19222aabe95848296a /defs
parent25a5227ab188b940d8bbc291bf4c9d62e5d63163 (diff)
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
Diffstat (limited to 'defs')
-rw-r--r--defs/gmake.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 63e63ee..86733bc 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)