diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 01:31:11 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 01:31:11 +0000 |
| commit | 6bdb88ac5b9d62ba014001b856683064a668e82d (patch) | |
| tree | 6a623f77e6896fe9cd248cefaf04623a1a30f67f | |
| parent | d44e87333f1f3a410c6962aec47dd73ce49f0d1f (diff) | |
| download | ruby-6bdb88ac5b9d62ba014001b856683064a668e82d.tar.gz ruby-6bdb88ac5b9d62ba014001b856683064a668e82d.tar.xz ruby-6bdb88ac5b9d62ba014001b856683064a668e82d.zip | |
* 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.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | configure.in | 5 |
3 files changed, 14 insertions, 1 deletions
@@ -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. diff --git a/Makefile.in b/Makefile.in index b697cd804..d48594b3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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) $@ diff --git a/configure.in b/configure.in index 53fd34373..94bc7977c 100644 --- a/configure.in +++ b/configure.in @@ -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) |