From 2e4c41f3949b46683531de81bfd8bccd9cb3607f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 22 Dec 2004 15:16:55 +0000
Subject: * configure.in (bsdi): use $(CC) for LDSHARED.  fixed
 [ruby-dev:25270]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index b38b59bb68..e41f2d0379 100644
--- a/configure.in
+++ b/configure.in
@@ -781,7 +781,7 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-linux* | gnu* | k*bsd*-gnu)
+linux* | gnu* | k*bsd*-gnu | bsdi*)
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
@@ -853,7 +853,11 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes ;;
 	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
 			rb_cv_dlopen=yes ;;
-	linux* | gnu* | k*bsd*-gnu | netbsd*)
+	bsdi3*) 	case "$CC" in
+			*shlicc*)	: ${LDSHARED="$CC -r"}
+					rb_cv_dlopen=yes ;;
+			esac ;;
+	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
 			: ${LDSHARED='${CC} -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@@ -876,13 +880,6 @@ if test "$with_dln_a_out" != yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-E"
 			fi
 			rb_cv_dlopen=yes ;;
-	bsdi3*) 	case "$CC" in
-			*shlicc*)	: ${LDSHARED="$CC -r"}
-					rb_cv_dlopen=yes ;;
-			esac ;;
-	bsdi*)		: ${LDSHARED="ld -shared"}
-			LDFLAGS="$LDFLAGS "'-rdynamic -Wl,-rpath,$(libdir)/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
-			rb_cv_dlopen=yes ;;
 	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
 			LDFLAGS="$LDFLAGS -u libsys_s"
 			rb_cv_dlopen=yes ;;
-- 
cgit v1.2.1