mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes
only when AC_COMPUTE_INT, and inverted the arguments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c9e7e6617b
commit
c29206461f
2 changed files with 13 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Aug 13 18:40:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes
|
||||
only when AC_COMPUTE_INT, and inverted the arguments.
|
||||
|
||||
Thu Aug 13 18:22:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of
|
||||
|
|
12
configure.in
12
configure.in
|
@ -189,7 +189,7 @@ if test ${target_archs+set}; then
|
|||
target=`echo $target | sed "s/^$target_cpu-/universal-/"`
|
||||
target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"`
|
||||
target_cpu=universal
|
||||
cross_compiling=yes
|
||||
real_cross_compiling=$cross_compiling
|
||||
else
|
||||
target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"`
|
||||
target_alias=`echo $target_alias | sed "s/^$target_cpu-/${target_archs}-/"`
|
||||
|
@ -381,8 +381,10 @@ esac
|
|||
AC_CHECK_TYPES([long long, off_t])
|
||||
|
||||
AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
|
||||
[AC_COMPUTE_INT([CHAR_BIT], [rb_cv_char_bit],
|
||||
[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])])
|
||||
[cross_compiling=yes
|
||||
AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
|
||||
[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
|
||||
cross_compiling=$real_cross_compiling])
|
||||
|
||||
dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
|
||||
AC_DEFUN([RUBY_CHECK_SIZEOF],
|
||||
|
@ -427,7 +429,8 @@ static ac__type_sizeof_ *rbcv_ptr;
|
|||
m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
|
||||
when([SIZEOF_*]);;
|
||||
when(*)])
|
||||
AC_COMPUTE_INT(AS_TR_CPP(SIZEOF_$1), [t], [AC_INCLUDES_DEFAULT([$4])]
|
||||
cross_compiling=yes
|
||||
AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
|
||||
[${cond+$cond
|
||||
@%:@else}
|
||||
$rbcv_var
|
||||
|
@ -435,6 +438,7 @@ ${cond+@%:@endif}
|
|||
@%:@ifndef AS_TR_CPP(SIZEOF_$1)
|
||||
@%:@define AS_TR_CPP(SIZEOF_$1) 0
|
||||
@%:@endif], [t=0])
|
||||
cross_compiling=$real_cross_compiling
|
||||
if test ${t-0} != 0; then
|
||||
AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue