diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:19:21 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:19:21 +0000 |
commit | a938a2748f7043aae56c377621f52de68d59d171 (patch) | |
tree | 4949f53879f9df31b738df563cde1515481970e6 /configure.in | |
parent | a2ac5607bf73ae5187b553742ab77a33f7f6a72e (diff) |
merge revision(s) 12205:
* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
it is done by libpathflag in mkmf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 56bc83d12d..ee0e81c257 100644 --- a/configure.in +++ b/configure.in @@ -1004,7 +1004,7 @@ AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl STATIC= -: ${LIBPATHFLAG=' -L"%s"'} +: ${LIBPATHFLAG=' -L%s'} : ${PATHFLAG=''} if test "$with_dln_a_out" != yes; then @@ -1068,7 +1068,7 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes ;; interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" - LIBPATHFLAG=" -L'%1\$-s'" + LIBPATHFLAG=" -L%1\$-s" rb_cv_dlopen=yes ;; freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"} if test "$rb_cv_binary_elf" = yes; then @@ -1148,8 +1148,8 @@ 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'" + LIBPATHFLAG=" -L%1\$-s" + RPATHFLAG=" ${linker_flag}-R%1\$-s" fi fi AC_SUBST(LINK_SO) |