summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-11 14:31:09 +0000
committerkanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-11 14:31:09 +0000
commit78a59b37a161080473ace8d2d14f1fbf6466d025 (patch)
treebf5376327fcdbba796edcf8c851752cca3145ba5
parent8f8e4e5ab5a58b21b366780f934578d230599851 (diff)
* configure.in: can not load libraries if --with-opt-dir is used
on AIX. [Bug #3107] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 02001846b7..6a2a5f3c60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 11 23:25:17 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * configure.in: can not load libraries if --with-opt-dir is used
+ on AIX. [Bug #3107]
+
Sun Apr 11 14:44:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
* lib/irb/ruby-lex.rb (RubyLex#getc): revert r10817, which caused
diff --git a/configure.in b/configure.in
index 4a7cc0a697..fe7f8d2d32 100644
--- a/configure.in
+++ b/configure.in
@@ -1815,7 +1815,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"
+ RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${LIBPATH:-/usr/lib:/lib}"
rb_cv_dlopen=yes],
[human*], [ : ${DLDFLAGS=''}
: ${LDSHARED=''}