diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:53:24 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:53:24 +0000 |
| commit | 563d603df103d0a02819f4ba6c15ba8e73d69fa9 (patch) | |
| tree | 5be3ea824f386e9504ba7899ab7a8f0938a2ad2b | |
| parent | 520f724895ac15f410e9b4c0bf86eef33f91b26c (diff) | |
merges r20573 and r20574 from trunk into ruby_1_9_1.
* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
is set. [ruby-talk:322136]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Dec 7 23:47:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG + is set. [ruby-talk:322136] + Sat Dec 6 17:51:35 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * pack.c (pack_pack): 'u0' is not special differently from 'm0'. diff --git a/configure.in b/configure.in index 8f7463142e..5b38723b20 100644 --- a/configure.in +++ b/configure.in @@ -1291,7 +1291,6 @@ AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl STATIC= -: ${LIBPATHFLAG=' -L%s'} : ${PATHFLAG=''} if test "$with_dln_a_out" != yes; then @@ -1321,7 +1320,6 @@ if test "$with_dln_a_out" != yes; then [ --disable-rpath embed run path into extension libraries.], [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"]) if test "$enable_rpath" = yes; then - LIBPATHFLAG=" -L%1\$-s" RPATHFLAG=" ${linker_flag}-R%1\$-s" fi @@ -1474,6 +1472,12 @@ if test "${LDSHAREDXX}" = ""; then ;; esac fi +case ${RPATHFLAG} in +*'%1$'*) + : ${LIBPATHFLAG=' -L%1$-s'};; +*) + : ${LIBPATHFLAG=' -L%s'};; +esac AC_SUBST(LINK_SO) AC_SUBST(LIBPATHFLAG) |