diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 10 14:19:33 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * configure.in: NetBSD 6 adds libexecinfo but it only works on amd64. + http://www.mail-archive.com/source-changes-full@netbsd.org/msg38729.html + Sun Jun 10 12:43:23 2012 Tanaka Akira <akr@fsij.org> * process.c (rb_f_exec): call rb_exec_async_signal_safe except on diff --git a/configure.in b/configure.in index 030b79e3c9..973445f56f 100644 --- a/configure.in +++ b/configure.in @@ -2079,14 +2079,19 @@ main(int argc, char *argv[]) test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD) fi -AS_CASE(["$target_os"], -[freebsd*], [ +AS_CASE(["$target_cpu-$target_os"], +[*-freebsd*], [ AC_CHECK_HEADERS([/usr/local/include/execinfo.h]) if test "x$ac_cv_header__usr_local_include_execinfo_h" = xyes; then : RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include) LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib" DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }-L/usr/local/lib" AC_CHECK_LIB([execinfo], [backtrace]) + fi], +[x86_64-netbsd*], [ + AC_CHECK_HEADERS([execinfo.h]) + if test "x$ac_cv_header_execinfo_h" = xyes; then : + AC_CHECK_LIB([execinfo], [backtrace]) fi]) AC_CHECK_FUNCS(backtrace) |