From 27487598893613820e6f5d2156b9fc212710af75 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 16 Apr 2026 16:06:12 +0900
Subject: Update default gemspecs so that default gems can run

---
 common.mk        | 13 ++++++-------
 tool/rdoc-srcdir | 15 ++-------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/common.mk b/common.mk
index 4407bc41fd..5a42138034 100644
--- a/common.mk
+++ b/common.mk
@@ -344,7 +344,7 @@ $(EXTS_MK): ext/configure-ext.mk $(srcdir)/template/exts.mk.tmpl \
 	    $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake) --configure-exts=ext/configure-ext.mk
 
 ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \
-		$(srcdir)/template/configure-ext.mk.tmpl
+		$(srcdir)/template/configure-ext.mk.tmpl update-default-gemspecs
 	$(ECHO) generating makefiles $@
 	$(Q)$(MAKEDIRS) $(@D)
 	$(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \
@@ -623,11 +623,11 @@ post-install-dbg::
 srcs-doc: prepare-gems
 
 RDOC_DEPENDS = main srcs-doc
-rdoc: PHONY $(RDOC_DEPENDS) $(RBCONFIG)
+rdoc: PHONY $(RDOC_DEPENDS) $(RBCONFIG) update-default-gemspecs
 	@echo Generating RDoc documentation
 	$(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) .
 
-html: PHONY $(RDOC_DEPENDS) $(RBCONFIG)
+html: PHONY $(RDOC_DEPENDS) $(RBCONFIG) update-default-gemspecs
 	@echo Generating RDoc HTML files
 	$(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) .
 
@@ -1576,11 +1576,10 @@ test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck
 yes-test-bundled-gems-precheck: $(PRECHECK_BUNDLED_GEMS:yes=main)
 no-test-bundled-gems-precheck:
 
-update-default-gemspecs: $(TEST_RUNNABLE)-update-default-gemspecs
-no-update-default-gemspecs:
-yes-update-default-gemspecs: $(PRECHECK_BUNDLED_GEMS:yes=main) $(PROGRAM)
+yes-update-default-gemspecs no-update-default-gemspecs: update-default-gemspecs
+update-default-gemspecs: $(PREP)
 	@$(MAKEDIRS) $(srcdir)/.bundle/specifications
-	@$(XRUBY) -W0 -C "$(srcdir)" -rrubygems \
+	$(Q)$(MINIRUBY) -W0 -C "$(srcdir)" -rrubygems \
 	    -e "destdir = ARGV.shift" \
 	    -e "ARGV.each do |basedir|" \
 	    -e   "Dir.glob(basedir+'/**/*.gemspec') do |g|" \
diff --git a/tool/rdoc-srcdir b/tool/rdoc-srcdir
index 67d024fc0b..bc5e6c4e9e 100755
--- a/tool/rdoc-srcdir
+++ b/tool/rdoc-srcdir
@@ -1,19 +1,8 @@
 #!ruby -W0
 
-srcdir = File.dirname(__dir__)
-bundled_gems = File.join(srcdir, "gems/bundled_gems")
-versions = {}
-File.foreach(bundled_gems) do |line|
-  next if line.start_with?("#") || line.strip.empty?
-  name, version, = line.split
-  versions[name] = version
-end
-
-%w[tsort rdoc].each do |lib|
-  path = File.join(srcdir, ".bundle/gems/#{lib}-#{versions[lib]}")
-  $LOAD_PATH.unshift("#{path}/lib")
-end
+require 'rubygems'
 require 'rdoc/rdoc'
+require 'rbs'
 
 # Make only the output directory relative to the invoked directory.
 invoked = Dir.pwd
-- 
cgit v1.2.3