summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4976fd5fef..65c3401215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 16 02:23:00 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * configure.in: can not load libruby.so if gcc is used with
+ --enable-shared on AIX.
+
Sat May 15 17:16:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
diff --git a/configure.in b/configure.in
index 98633bb526..4da4285bba 100644
--- a/configure.in
+++ b/configure.in
@@ -1813,11 +1813,7 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
fi
rb_cv_dlopen=yes],
- [aix*], [ if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -shared'}
- else
- : ${LDSHARED='$(CC)'}
- fi
+ [aix*], [ : ${LDSHARED='$(CC)'}
LDSHARED="$LDSHARED ${linker_flag}-G"
DLDFLAGS='-eInit_$(TARGET)'
XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
@@ -1826,7 +1822,7 @@ if test "$with_dln_a_out" != yes; then
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
: ${LIBPATHENV=SHLIB_PATH}
- RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${LIBPATH:-/usr/lib:/lib}"
+ RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
rb_cv_dlopen=yes],
[human*], [ : ${DLDFLAGS=''}
: ${LDSHARED=''}