From 491a7ee7a662b4a8dddaaf850f58798b16bbe3b8 Mon Sep 17 00:00:00 2001 From: nobu 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/trunk@11246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c1233c65c9..e7e611eee5 100644 --- a/configure.in +++ b/configure.in @@ -994,13 +994,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)' @@ -1322,13 +1324,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*) -- cgit v1.2.3