usa	2013-04-04 16:19:19 +0900 (Thu, 04 Apr 2013)

  New Revision: 40098

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

  Log:
    merge revision(s) 39578: [Backport #8009]
    
    * Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
      must appear after object files with newer versions of gcc.  patch by
      tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/Makefile.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 40097)
+++ ruby_1_9_3/ChangeLog	(revision 40098)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Apr  4 16:17:14 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
+	  must appear after object files with newer versions of gcc.  patch by
+	  tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009]
+
 Thu Apr  4 09:44:10 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
Index: ruby_1_9_3/Makefile.in
===================================================================
--- ruby_1_9_3/Makefile.in	(revision 40097)
+++ ruby_1_9_3/Makefile.in	(revision 40098)
@@ -163,12 +163,13 @@ all: https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/Makefile.in#L163
 miniruby$(EXEEXT):
 		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(POSTLINK)
 
 # We must `rm' the library each time this rule is invoked because "updating" a
 # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40097)
+++ ruby_1_9_3/version.h	(revision 40098)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 409
+#define RUBY_PATCHLEVEL 410
 
 #define RUBY_RELEASE_DATE "2013-04-04"
 #define RUBY_RELEASE_YEAR 2013

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39578


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