mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
25a5227ab1
commit
ff57f6f69a
1 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue