diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-24 15:52:07 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-24 15:52:07 +0000 |
| commit | b7880f1f7ec05ce05abd06f14092a1711c69ad12 (patch) | |
| tree | e327094280728fe4f3766c6573a1b71a2e3227b8 | |
| parent | a5e89ea4e76e4e169162cab2959c4c6e1214d212 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Mon Mar 25 00:51:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@atdot.net> * iseq.c (iseq_data_to_ary): fix condition. diff --git a/Makefile.in b/Makefile.in index 45eb7c68e8..a93a1e61df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -194,12 +194,12 @@ all: 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 @@ -1,6 +1,6 @@ #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 |