summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-01-19 22:03:07 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2023-01-20 00:21:53 +0900
commit569fbf229b0b107859e006c810a9d04851e96655 (patch)
treeef96fdf8fae9ba0baca14b42f2a080fa5d51e5e1
parentf36178006b99fd121e7936968d210e570f8d99d0 (diff)
downloadruby-569fbf229b0b107859e006c810a9d04851e96655.tar.gz
Run `after-update` in the same main make process [ci skip]
-rw-r--r--common.mk2
-rw-r--r--defs/gmake.mk4
2 files changed, 5 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 86f93c4c47..7158bdc26d 100644
--- a/common.mk
+++ b/common.mk
@@ -1345,7 +1345,7 @@ dist:
up:: update-remote
-up::
+up$(DOT_WAIT)::
-$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY ALWAYS_UPDATE_UNICODE= after-update
yes::
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 51827ad142..2f0bc8b810 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -354,6 +354,10 @@ $(srcdir)/gems/src:
$(srcdir)/.bundle/gems:
$(MAKEDIRS) $@
+ifneq ($(DOT_WAIT),)
+up:: $(DOT_WAIT) after-update
+endif
+
ifneq ($(filter update-bundled_gems refresh-gems,$(MAKECMDGOALS)),)
update-gems: update-bundled_gems
endif