From 288da355e3575a7331f75ae2a8593e59d4433d78 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 16 Nov 2012 07:24:45 +0000 Subject: [PATCH] configure.in: cross-compiling fix * configure.in (DTRACE): ignore non-prefixed version if cross-compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- configure.in | 5 ++++- 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 +Fri Nov 16 16:24:42 2012 Nobuyoshi Nakada + + * 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=] )