kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in (DLNOBJS): defined.

Browse source 
* Makefile.in (miniruby): use DLNOBJS and COMMONOBJS instead of
  MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-11-12 01:31:11 +00:00
parent 457686dd11
commit 6f9dbb1636
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Nov 12 10:29:16 2007 Tanaka Akira <akr@fsij.org>
* configure.in (DLNOBJS): defined.
* Makefile.in (miniruby): use DLNOBJS and COMMONOBJS instead of
MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.
Sun Nov 11 20:32:45 2007 Tanaka Akira <akr@fsij.org>
* {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.

3
Makefile.in
View file

@ -51,6 +51,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
SOLIBS = @SOLIBS@
MAINLIBS = @MAINLIBS@
MINIOBJS = @MINIOBJS@
DLNOBJS = @DLNOBJS@
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
RUBY_SO_NAME=@RUBY_SO_NAME@
@ -105,7 +106,7 @@ all:
miniruby$(EXEEXT):
@$(RM) $@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(DLNOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
$(PROGRAM):
@$(RM) $@

5
configure.in
View file

@ -1410,6 +1410,7 @@ AC_SUBST(RDOCTARGET)
if test "$rb_with_pthread" = "yes"; then
THREAD_MODEL=pthread
fi
DLNOBJS=dln.o
case "$target_os" in
linux*)
XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
@ -1433,6 +1434,7 @@ case "$target_os" in
;;
darwin*)
CFLAGS="$CFLAGS -pipe -fno-common"
DLNOBJS=dmydln.o
MINIOBJS=dmydln.o
;;
os2-emx)
@ -1496,6 +1498,7 @@ case "$target_os" in
LIBRUBY='lib$(RUBY_SO_NAME).a'
LIBRUBYARG='-l$(RUBY_SO_NAME)'
fi
DLNOBJS=dmydln.o
MINIOBJS=dmydln.o
;;
hpux*)
@ -1505,6 +1508,7 @@ case "$target_os" in
YACC="$YACC -Nl40000 -Nm40000"
;;
esac
DLNOBJS=dmydln.o
MINIOBJS=dmydln.o
;;
*)
@ -1539,6 +1543,7 @@ AC_SUBST(COMMON_LIBS)
AC_SUBST(COMMON_MACROS)
AC_SUBST(COMMON_HEADERS)
AC_SUBST(EXPORT_PREFIX)
AC_SUBST(DLNOBJS)
AC_SUBST(MINIOBJS)
AC_SUBST(THREAD_MODEL)