From e889413a52ff8a12d169c6ab7fa396ac20b5f36d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 30 Oct 2006 14:41:43 +0000
Subject: * Makefile.in (miniruby): add XLDFLAGS.

* configure.in (aix): use -bE option for miniruby.  [ruby-dev:29698]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  6 +++++-
 Makefile.in  |  2 +-
 configure.in | 29 +++++++++++++----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4172bb2673..2a93650d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Mon Oct 30 23:22:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (miniruby): add XLDFLAGS.
+
+	* configure.in (aix): use -bE option for miniruby.  [ruby-dev:29698]
 
 	* dir.c (glob_helper): get rid of possible memory leak.
 
diff --git a/Makefile.in b/Makefile.in
index 91588bb572..be1e0022a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ all:
 
 miniruby$(EXEEXT):
 		@$(RM) $@
-		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(MAINLIBS)
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
diff --git a/configure.in b/configure.in
index b8bb3b0332..589642a754 100644
--- a/configure.in
+++ b/configure.in
@@ -1045,13 +1045,15 @@ if test "$with_dln_a_out" != yes; then
 			: ${LIBPATHENV=DYLD_LIBRARY_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"
+			    : ${LDSHARED='$(CC) -shared'}
+			    DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
+			    LDFLAGS='-Wl,-brtl'
+			    XLDFLAGS='-Wl,-bE:ruby.imp'
+			else
+			    : ${LDSHARED='/usr/ccs/bin/ld'}
+			    DLDFLAGS='-G -eInit_$(TARGET)'
+			    LDFLAGS='-brtl'
+			    XLDFLAGS='-bE:ruby.imp'
                         fi
                         : ${ARCHFILE="ruby.imp"}
                         TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
@@ -1359,13 +1361,12 @@ if test "$enable_shared" = 'yes'; then
 	;;
     aix*)
 	if test "$GCC" = yes; then
-	    LIBRUBY_LDSHARED='$(CC) -shared'
-	    LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bE:ruby.imp -Wl,-bnoentry'
+	    LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
 	else
-	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
-	    LIBRUBY_DLDFLAGS='-G -bE:ruby.imp -bnoentry'
+	    LIBRUBY_DLDFLAGS='-G -bnoentry'
 	fi
-	LIBRUBYARG_SHARED='-L${libdir} -lruby'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
+	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 	SOLIBS='-lm -lc'
 	;;
     beos*)
@@ -1500,9 +1501,6 @@ case "$target_os" in
 	esac
 	MINIOBJS=dmydln.o
 	;;
-    aix*)
-	PREINSTALL='@$(RM) -r $(prefix)/lib/$(LIBRUBY_A) $(prefix)/lib/$(LIBRUBY_SO) $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)'
-	;;
     *)
 	;;
 esac
@@ -1535,7 +1533,6 @@ AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
 AC_SUBST(MINIOBJS)
-AC_SUBST(PREINSTALL)
 
 MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
 MAKEFILES="`echo $MAKEFILES`"
-- 
cgit v1.2.3