aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-30 17:36:09 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-30 17:36:09 +0000
commit1d695c36b963c49cb7b68542b0e8fd45874d51e3 (patch)
treee89e7596dad7ac9e395c7108d47f66407ee85eab
parent0d3cd4119e8c18dba326aa51ec0aee7719d30b31 (diff)
downloadruby-1d695c36b963c49cb7b68542b0e8fd45874d51e3.tar.gz
* configure.in (--with-opt-dir): Make this also work on DLDFLAGS
so LIBRUBY_SO links fine with libexecinfo installed in a non-system directory. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a685ce97d8..abdc97f6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 1 02:34:53 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * configure.in (--with-opt-dir): Make this also work on DLDFLAGS
+ so LIBRUBY_SO links fine with libexecinfo installed in a
+ non-system directory.
+
Sun Sep 30 23:32:00 2012 Kenta Murata <mrkn@mrkn.jp>
* vm_dump.c (rb_vm_bugreport): add /Library/Logs/DiagnosticReports
diff --git a/configure.in b/configure.in
index 8869b01961..c8fadab9e4 100644
--- a/configure.in
+++ b/configure.in
@@ -2353,7 +2353,9 @@ AC_ARG_WITH(opt-dir,
[
CPPFLAGS="$CPPFLAGS -I$withval/include"
val=`echo $withval|sed 's/\\//\\\\\\//g'`
- LDFLAGS="$LDFLAGS "`echo ${LIBPATHFLAG} ${RPATHFLAG}|sed -E 's/%1\\$-s|%s/'${val}'\/lib/g'`
+ val=`echo ${LIBPATHFLAG} ${RPATHFLAG}|sed -E 's/%1\\$-s|%s/'${val}'\/lib/g'`
+ LDFLAGS="$LDFLAGS $val"
+ DLDFLAGS="$DLDFLAGS $val"
])
AS_CASE(["$target_cpu-$target_os"],