https://git.ruby-lang.org/ruby.git/commit/?id=405644f38c

From 405644f38c64dca3524e3fa32fd9722bcd2a1e0b Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Thu, 5 Aug 2021 14:47:39 +0900
Subject: Revert "Removed extinit.o from main programs"

This reverts commit ac86fcbfd0bab8667d277aa575bc5b81e5135d3c.

This change broke "--disable-shared --with-static-linked-ext".
---
 template/Makefile.in | 2 +-
 win32/Makefile.sub   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/template/Makefile.in b/template/Makefile.in
index 27dcd8e..60a068d 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -277,7 +277,7 @@ miniruby$(EXEEXT): https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L277
 $(PROGRAM):
 		@$(RM) $@
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
 		$(Q) $(POSTLINK)
 
 PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(gnumake:yes=exec) $(RM) $(LIBRUBY_EXTS)
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 2eb6292..a124236 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1093,9 +1093,8 @@ miniruby.rc: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1093
 !if "$(PROGRAM)" != ""
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(ECHO) linking $(@:\=/)
-		$(Q) $(PURIFY) $(CC) $(MAINOBJ) \
-			$(RUBY_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
-			-link $(LDFLAGS) $(XLDFLAGS)
+		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(EXTOBJS) $(RUBY_INSTALL_NAME).res \
+			$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
 		$(Q) $(LDSHARED_0)
 		$(Q) $(LDSHARED_1)
 		$(Q) $(LDSHARED_2)
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/