github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* 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:
nobu 2009-08-13 09:40:12 +00:00
Родитель c9e7e6617b
Коммит c29206461f
2 изменённых файлов: 13 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
ChangeLog
Просмотреть файл

@ -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> Thu Aug 13 18:22:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of * configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of

12
configure.in
Просмотреть файл

@ -189,7 +189,7 @@ if test ${target_archs+set}; then
target=`echo $target | sed "s/^$target_cpu-/universal-/"` target=`echo $target | sed "s/^$target_cpu-/universal-/"`
target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"` target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"`
target_cpu=universal target_cpu=universal
cross_compiling=yes real_cross_compiling=$cross_compiling
else else
target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"` target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"`
target_alias=`echo $target_alias | 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_CHECK_TYPES([long long, off_t])
AC_CACHE_CHECK([char bit], [rb_cv_char_bit], AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
[AC_COMPUTE_INT([CHAR_BIT], [rb_cv_char_bit], [cross_compiling=yes
[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])]) 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] dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
AC_DEFUN([RUBY_CHECK_SIZEOF], 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 m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
when([SIZEOF_*]);; when([SIZEOF_*]);;
when(*)]) 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 [${cond+$cond
@%:@else} @%:@else}
$rbcv_var $rbcv_var
@ -435,6 +438,7 @@ ${cond+@%:@endif}
@%:@ifndef AS_TR_CPP(SIZEOF_$1) @%:@ifndef AS_TR_CPP(SIZEOF_$1)
@%:@define AS_TR_CPP(SIZEOF_$1) 0 @%:@define AS_TR_CPP(SIZEOF_$1) 0
@%:@endif], [t=0]) @%:@endif], [t=0])
cross_compiling=$real_cross_compiling
if test ${t-0} != 0; then 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}" AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
fi fi