yugui	2009-04-12 23:02:46 +0900 (Sun, 12 Apr 2009)

  New Revision: 23179

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23179

  Log:
    merges r22870 from trunk into ruby_1_9_1.
    --
    * win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO
      and so on.  based on a patch by Charlie Savage at
      [ruby-core:22794]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23178)
+++ ruby_1_9_1/ChangeLog	(revision 23179)
@@ -1,5 +1,9 @@
-Tue Mar 10 12:27:52 2009  Nobuyoshi Nakada  <nobu@r...>
+Tue Mar 10 13:45:54 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO
+	  and so on.  based on a patch by Charlie Savage at
+	  [ruby-core:22794]
+
 	* win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so
 	  that extconf.rb could refer it.  [ruby-core:22725]
 
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 23178)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 23179)
@@ -624,7 +624,7 @@
 s,@LIBPATHFLAG@, -libpath:"%s",;t t
 s,@RPATHFLAG@,,;t t
 s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t
+s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) -link $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t
 !if $(MSC_VER) >= 1400
 s,@LINK_SO@,@$$(RUBY) -run -e wait_writable -- -n 10 $$(@),;t t
 s,@LINK_SO@,$(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t
@@ -659,7 +659,7 @@
 
 miniruby$(EXEEXT):
 		@echo. $(LIBS)
-		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ $(LDFLAGS)
+		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
 		miniruby.exe -v
 		$(LDSHARED_1)
 		$(LDSHARED_2)
@@ -670,7 +670,7 @@
 !if "$(PROGRAM)" != ""
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
-			$(OUTFLAG)$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS)
+			$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
 		$(LDSHARED_0)
 		$(LDSHARED_1)
 		$(LDSHARED_2)
@@ -680,7 +680,7 @@
 $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
 		$(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
 			$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
-			$(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
+			-link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
 		$(LDSHARED_0)
 		$(LDSHARED_1)
 		$(LDSHARED_2)
@@ -696,7 +696,7 @@
 		@echo. $(DLDOBJS)
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
-			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \
+			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \
 			$(LIBRUBY_DLDFLAGS)
 		$(LDSHARED_0)
 		$(LDSHARED_1)

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