From 46f4cfb1624c372b1be9205cb2a1ead840cc813a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 12 Mar 2020 23:38:14 +0900 Subject: [PATCH] `update-gems` should wait for `update-bundled_gems` --- defs/gmake.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/defs/gmake.mk b/defs/gmake.mk index b9b16e3744..a359b44eab 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -243,15 +243,12 @@ HELP_EXTRA_TASKS = \ " update-github: merge master branch and push it to Pull Request [PR=1234]" \ "" -ifneq ($(filter extract-gems refresh-gems prepare-gems,$(MAKECMDGOALS)),) +ifneq ($(filter refresh-gems prepare-gems,$(MAKECMDGOALS)),) extract-gems: update-gems endif -ifneq ($(filter refresh-gems,$(MAKECMDGOALS)),) +ifneq ($(filter update-bundled_gems refresh-gems,$(MAKECMDGOALS)),) update-gems: update-bundled_gems endif -ifneq ($(filter update-gems prepare-gems,$(MAKECMDGOALS)),) -update-gems: $(filter update-bundled_gems,$(MAKECMDGOALS)) -endif ifeq ($(filter 0 1,$(words $(arch_flags))),) $(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \