diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-16 07:24:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-16 07:24:45 +0000 |
| commit | 288da355e3575a7331f75ae2a8593e59d4433d78 (patch) | |
| tree | 80ff25deb94594301c2e30b62baa37105dfbae9d | |
| parent | 620a2b6c65ef497529bca89abae5ea7d16e0d191 (diff) | |
| download | ruby-288da355e3575a7331f75ae2a8593e59d4433d78.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -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=] ) |