Skip to content

Commit 1998614

Browse files
committed
Flush out-of-date gems at extracting bundled gems
1 parent bcce142 commit 1998614

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

common.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1531,8 +1531,12 @@ update-coverage: main PHONY
15311531
--install-dir .bundle --conservative "simplecov"
15321532

15331533
refresh-gems: update-bundled_gems prepare-gems
1534+
# can't recall exactly, but `make` somewhere (not GNU or nmake)
1535+
# couldn't handle spaces in replacement strings; i.e.,
1536+
# `$(HAVE_BASERUBY:yes=word word ...)` didn't work.
15341537
prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
1535-
extract-gems: $(HAVE_BASERUBY:yes=update-gems)
1538+
extract-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=outdate-bundled-gems)
1539+
update-gems: $(HAVE_BASERUBY:yes=outdate-bundled-gems)
15361540

15371541
update-gems$(sequential): PHONY
15381542
$(ECHO) Downloading bundled gem files...
@@ -1566,6 +1570,7 @@ extract-gems$(sequential): PHONY
15661570

15671571
extract-gems$(sequential): $(HAVE_GIT:yes=clone-bundled-gems-src)
15681572

1573+
flush-gems: outdate-bundled-gems
15691574
outdate-bundled-gems: PHONY
15701575
$(Q) $(BASERUBY) $(tooldir)/[email protected] --make="$(MAKE)" --mflags="$(MFLAGS)" \
15711576
--ruby-platform=$(arch) --ruby-version=$(ruby_version) \

0 commit comments

Comments
 (0)