diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Mar 4 14:13:36 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 4 10:23:00 2013 Zachary Scott <zachary@zacharyscott.net> * encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255] diff --git a/Makefile.in b/Makefile.in index a57aabe12c..5b5e46eadc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,12 +197,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 |