Skip to content

Commit d0d6eeb

Browse files
committed
Update default gemspecs by baseruby when updating sources
1 parent becf5bb commit d0d6eeb

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

common.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ refresh-gems: update-bundled_gems prepare-gems
15221522
prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
15231523
extract-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=outdate-bundled-gems)
15241524
update-gems: $(HAVE_BASERUBY:yes=outdate-bundled-gems)
1525-
update-gems: $(HAVE_BASERUBY:yes=update-default-gemspecs)
1525+
update-gems: $(HAVE_BASERUBY:yes=update-default-gemspecs-baseruby)
15261526

15271527
split_option = -F"\s+|$(HASH_SIGN).*"
15281528

@@ -1578,6 +1578,11 @@ yes-test-bundled-gems-precheck: $(PRECHECK_BUNDLED_GEMS:yes=main)
15781578
no-test-bundled-gems-precheck:
15791579

15801580
yes-update-default-gemspecs no-update-default-gemspecs: update-default-gemspecs
1581+
update-default-gemspecs-$(gnumake:yes=base)ruby: MINIRUBY = $(BASERUBY)
1582+
update-default-gemspecs-$(gnumake:yes=base)ruby: PREP =
1583+
update-default-gemspecs-$(gnumake:yes=base)ruby: update-default-gemspecs
1584+
update-default-gemspecs-$(gnumake:yes=no)baseruby:
1585+
+$(MAKE) "MINIRUBY=$(BASERUBY)" update-default-gemspecs
15811586
update-default-gemspecs: $(PREP)
15821587
@$(MAKEDIRS) $(srcdir)/.bundle/specifications
15831588
$(Q)$(MINIRUBY) -W0 -C "$(srcdir)" -I tool/lib -roptparse -routput -rbundled_gem \

0 commit comments

Comments
 (0)