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 | 6f9dbb1636e34dbf12e45b31bc1f54611d174280 (patch) | |
| tree | 6a623f77e6896fe9cd248cefaf04623a1a30f67f /configure.in | |
| parent | 457686dd11881afbaed38c03bc94dcc79dd9b908 (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@13888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 53fd343731..94bc7977cd 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) |