kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

configure.in: move after AC_PROG_CC

Browse source 
* configure.in (DTRACE): move after AC_PROG_CC since cross_compiling
  is set in it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-11-16 08:30:56 +00:00
parent c9b6a01435
commit 1c7f72dac2
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

16
configure.in
View file

@ -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