[前][次][番号順一覧][スレッド一覧]

ruby-changes:66668

From: Nobuyoshi <ko1@a...>
Date: Sat, 3 Jul 2021 12:54:28 +0900 (JST)
Subject: [ruby-changes:66668] ac86fcbfd0 (master): Removed extinit.o from main programs

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

From ac86fcbfd0bab8667d277aa575bc5b81e5135d3c Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 3 Jul 2021 01:07:53 +0900
Subject: Removed extinit.o from main programs

It is included in libruby, which is linked into the main programs.
---
 template/Makefile.in | 2 +-
 win32/Makefile.sub   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/template/Makefile.in b/template/Makefile.in
index 60a068d..27dcd8e 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) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(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 1d77b74..cce75af 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1092,8 +1092,9 @@ miniruby.rc: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1092
 !if "$(PROGRAM)" != ""
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(ECHO) linking $(@:\=/)
-		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(EXTOBJS) $(RUBY_INSTALL_NAME).res \
-			$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
+		$(Q) $(PURIFY) $(CC) $(MAINOBJ) \
+			$(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/

[前][次][番号順一覧][スレッド一覧]