summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-27 06:43:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-27 06:43:30 +0000
commit3c36edc0d2b5da5444b8ebbcc605367de9745fe5 (patch)
tree4b0526fb76395ccfbca59312ec2d5f7a5820482c
parent238198406963869a5d3e75030f7f7e63aee1f1b7 (diff)
* configure.in: link addr2line only for ELF.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--addr2line.c4
-rw-r--r--common.mk1
-rw-r--r--configure.in1
4 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 429713d..6b8d0b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 27 15:43:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: link addr2line only for ELF.
+
Sat Nov 27 13:58:55 2010 Shugo Maeda <shugo@ruby-lang.org>
* lib/optparse.rb (OptionParser#candidate): : was missing. Thanks,
diff --git a/addr2line.c b/addr2line.c
index 878ea9d..443333f 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -543,4 +543,6 @@ rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
free(lines);
}
-#endif /* defined(__ELF__) */
+#else /* defined(__ELF__) */
+#error not supported
+#endif
diff --git a/common.mk b/common.mk
index cf66e42..c45c3e1 100644
--- a/common.mk
+++ b/common.mk
@@ -91,7 +91,6 @@ COMMONOBJS = array.$(OBJEXT) \
vm_dump.$(OBJEXT) \
thread.$(OBJEXT) \
cont.$(OBJEXT) \
- addr2line.$(OBJEXT) \
$(BUILTIN_ENCOBJS) \
$(BUILTIN_TRANSOBJS) \
$(MISSING)
diff --git a/configure.in b/configure.in
index 2168f59..a80241b 100644
--- a/configure.in
+++ b/configure.in
@@ -1844,6 +1844,7 @@ if test "$rb_cv_binary_elf" = yes; then
if test "$with_dln_a_out" = yes; then
AC_MSG_ERROR(dln_a_out does not work with ELF)
fi
+ AC_LIBOBJ([addr2line])
fi
AS_CASE(["$target_os"],