diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 16 |
2 files changed, 12 insertions, 9 deletions
@@ -1,4 +1,7 @@ -Fri Nov 16 16:24:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Nov 16 17:30:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (DTRACE): move after AC_PROG_CC since cross_compiling + is set in it. * configure.in (DTRACE): ignore non-prefixed version if cross-compiling. diff --git a/configure.in b/configure.in index 504343af96..ee9ea8a112 100644 --- a/configure.in +++ b/configure.in @@ -373,14 +373,6 @@ if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi -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=] -) - AC_PROG_CC AC_PROG_CXX RUBY_MINGW32 @@ -396,6 +388,14 @@ else linker_flag= fi +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=] +) + RUBY_PROG_GNU_LD RUBY_CPPOUTFILE |