From 50ef220b5a60260dd44d994a99f2baee9f8582f4 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Aug 2006 05:44:43 +0000
Subject: * configure.in, common.mk: AIX link issue.  a patch from Yutaka  
 Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29190]

* ext/socket/socket.c: AIX socket support.  [ruby-dev:29190]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 02c33e2c81..0feaa29ab8 100644
--- a/configure.in
+++ b/configure.in
@@ -973,16 +973,20 @@ if test "$with_dln_a_out" != yes; then
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
 			rb_cv_dlopen=yes ;;
-	aix*)		: ${LDSHARED='/usr/ccs/bin/ld'}
-			XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp"
-			DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
-			LDFLAGS="-brtl $LDFLAGS"
-			: ${ARCHFILE="ruby.imp"}
-			TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
-			TRY_LINK="$TRY_LINK"' $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-			: ${LIBPATHENV=SHLIB_PATH}
-			rb_cv_dlopen=yes ;;
-
+        aix*)           if test "$GCC" = yes; then
+                           : ${LDSHARED='gcc -shared'}
+                           DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
+                           LDFLAGS='-Wl,-brtl -Wl,-bE:ruby.imp'
+                        else
+                          : ${LDSHARED='/usr/ccs/bin/ld'}
+                          DLDFLAGS='-G -eInit_$(TARGET)'
+                          LDFLAGS="-brtl -bE:ruby.imp"
+                        fi
+                        : ${ARCHFILE="ruby.imp"}
+                        TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
+                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
+                        : ${LIBPATHENV=SHLIB_PATH}
+                        rb_cv_dlopen=yes ;;
 	human*)		: ${DLDFLAGS=''}
 			: ${LDSHARED=''}
 			: ${LDFLAGS=''}
@@ -1299,12 +1303,12 @@ if test "$enable_shared" = 'yes'; then
     aix*)
 	if test "$GCC" = yes; then
 	    LIBRUBY_LDSHARED='$(CC) -shared'
-	    LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
+	    LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bE:ruby.imp -Wl,-bnoentry'
 	else
 	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
-	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
+	    LIBRUBY_DLDFLAGS='-G -bE:ruby.imp -bnoentry'
 	fi
-	LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so'
+	LIBRUBYARG_SHARED='-L${libdir} -lruby'
 	SOLIBS='-lm -lc'
 	;;
     beos*)
-- 
cgit v1.2.1