mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Makefile.in: move MAINLIBC after objects
* 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/trunk@39578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
14cc02fb64
commit
a5a4963018
2 changed files with 8 additions and 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>
|
Mon Mar 4 10:23:00 2013 Zachary Scott <zachary@zacharyscott.net>
|
||||||
|
|
||||||
* encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255]
|
* encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255]
|
||||||
|
|
|
@ -197,12 +197,12 @@ all:
|
||||||
miniruby$(EXEEXT):
|
miniruby$(EXEEXT):
|
||||||
@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
|
@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
|
||||||
$(ECHO) linking $@
|
$(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):
|
$(PROGRAM):
|
||||||
@$(RM) $@
|
@$(RM) $@
|
||||||
$(ECHO) linking $@
|
$(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)
|
$(Q) $(POSTLINK)
|
||||||
|
|
||||||
# We must `rm' the library each time this rule is invoked because "updating" a
|
# We must `rm' the library each time this rule is invoked because "updating" a
|
||||||
|
|
Loading…
Reference in a new issue