Skip to content

Commit

Permalink
Makefile.in: move MAINLIBC after objects
Browse files Browse the repository at this point in the history
* 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 ruby#8009]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Mar 4, 2013
1 parent 14cc02f commit a5a4963
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Mon Mar 4 14:13:36 2013 Nobuyoshi Nakada <[email protected]>

* 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 <[email protected]>

* encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255]
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a5a4963

Please sign in to comment.