aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32756eb957..38e7d2587d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Fri Nov 16 15:42:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 16 16:24:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (DTRACE): ignore non-prefixed version if
+ cross-compiling.
* Makefile.in, win32/Makefile.sub (probes.h): fix copying dmyprobes.h
path when outplace-build.
diff --git a/configure.in b/configure.in
index 375d204e4b..504343af96 100644
--- a/configure.in
+++ b/configure.in
@@ -373,7 +373,10 @@ if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc)
fi
-AC_CHECK_TOOL(DTRACE, dtrace)
+AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
+if test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"; then
+ AC_CHECK_PROG([DTRACE], [dtrace], [dtrace])
+fi
AS_CASE(["$target_os"],
[freebsd*], [DTRACE=]
)