nagachika	2013-03-25 00:52:07 +0900 (Mon, 25 Mar 2013)

  New Revision: 39911

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

  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_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/Makefile.in
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39910)
+++ ruby_2_0_0/ChangeLog	(revision 39911)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 25 00:51:57 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]
+
 Mon Mar 25 00:47:04 2013  Koichi Sasada  <ko1@a...>
 
 	* iseq.c (iseq_data_to_ary): fix condition.
Index: ruby_2_0_0/Makefile.in
===================================================================
--- ruby_2_0_0/Makefile.in	(revision 39910)
+++ ruby_2_0_0/Makefile.in	(revision 39911)
@@ -194,12 +194,12 @@ all: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/Makefile.in#L194
 miniruby$(EXEEXT):
 		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(DTRACE_OBJ) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(DTRACE_OBJ) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
 		$(Q) $(POSTLINK)
 
 # We must `rm' the library each time this rule is invoked because "updating" a
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39910)
+++ ruby_2_0_0/version.h	(revision 39911)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-25"
-#define RUBY_PATCHLEVEL 88
+#define RUBY_PATCHLEVEL 89
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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